Author: lindner
Date: Fri Jun 5 22:58:00 2009
New Revision: 782158
URL: http://svn.apache.org/viewvc?rev=782158&view=rev
Log:
SHINDIG-1080 | Upgrade to Google Collections 1.0
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterUris.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.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/render/DefaultRpcServiceLookupTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
incubator/shindig/trunk/pom.xml
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
Fri Jun 5 22:58:00 2009
@@ -22,7 +22,7 @@
import org.apache.shindig.common.util.Utf8UrlCoder;
import org.apache.commons.lang.StringUtils;
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
import com.google.inject.Singleton;
import java.util.Map;
@@ -49,7 +49,7 @@
* @return token with values separated by colons
*/
public String encodeToken(SecurityToken token) {
- return Join.join(":",
+ return Joiner.on(":").join(
Utf8UrlCoder.encode(token.getOwnerId()),
Utf8UrlCoder.encode(token.getViewerId()),
Utf8UrlCoder.encode(token.getAppId()),
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
Fri Jun 5 22:58:00 2009
@@ -37,7 +37,6 @@
import javax.el.ValueExpression;
import javax.el.VariableMapper;
-import com.google.common.base.Nullable;
import com.google.common.collect.Maps;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -62,7 +61,7 @@
}
@Inject
- public Expressions(@Nullable Functions functions) {
+ public Expressions(Functions functions) {
this.functions = functions;
factory = newExpressionFactory();
// Stub context with no FunctionMapper, used only to parse expressions
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/NamespaceSet.java
Fri Jun 5 22:58:00 2009
@@ -73,7 +73,7 @@
* @return the converted name, left as is if no conversion was required.
*/
public String getElementName(String name) {
- return Objects.firstNonNull(elementNames.get(name), name);
+ return elementNames.get(name) != null ? elementNames.get(name) : name;
}
/**
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=782158&r1=782157&r2=782158&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
Fri Jun 5 22:58:00 2009
@@ -38,6 +38,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
+import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimaps;
/**
@@ -67,7 +68,7 @@
@Test
public void serializeSimpleMultimap() throws Exception {
- Multimap<String, String> map = Multimaps.newLinkedHashMultimap();
+ Multimap<String, String> map = LinkedHashMultimap.create();
Set<String> methods = ImmutableSet.of("system.listMethods", "people.get");
map.putAll("hostEndpoint", methods);
assertJsonEquals("{hostEndpoint : ['system.listMethods', 'people.get']}",
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
Fri Jun 5 22:58:00 2009
@@ -32,6 +32,7 @@
import org.apache.shindig.gadgets.spec.SpecParserException;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -95,7 +96,7 @@
if (version == null) {
// TODO: The label param should only be used for metadata calls. This
should probably be
// exposed up a layer in the stack, perhaps at the interface level.
- String label = Objects.firstNonNull(context.getParameter(LABEL_PARAM),
DEFAULT_LABEL);
+ String label = firstNonNull(context.getParameter(LABEL_PARAM),
DEFAULT_LABEL);
version = manifest.getVersion(label);
@@ -223,4 +224,7 @@
}
}
}
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
Fri Jun 5 22:58:00 2009
@@ -86,7 +86,7 @@
if (containerConfig == null) {
return ImmutableMultimap.<String, String>builder().build();
}
- LinkedHashMultimap<String, String> endpointServices =
Multimaps.newLinkedHashMultimap();
+ LinkedHashMultimap<String, String> endpointServices =
LinkedHashMultimap.create();
// First check services directly declared in container config
Map<String, Object> declaredServices = containerConfig.getMap(container,
OSAPI_SERVICES);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterUris.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterUris.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterUris.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterUris.java
Fri Jun 5 22:58:00 2009
@@ -20,6 +20,7 @@
import org.apache.shindig.config.ContainerConfig;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -45,16 +46,19 @@
}
public String getProxyBase(String container) {
- container = Objects.firstNonNull(container,
ContainerConfig.DEFAULT_CONTAINER);
+ container = firstNonNull(container, ContainerConfig.DEFAULT_CONTAINER);
- return Objects.firstNonNull(config.getString(container,
PROXY_BASE_CONFIG_PROPERTY),
+ return firstNonNull(config.getString(container,
PROXY_BASE_CONFIG_PROPERTY),
proxyBaseNoGadget);
}
public String getConcatBase(String container) {
- container = Objects.firstNonNull(container,
ContainerConfig.DEFAULT_CONTAINER);
+ container = firstNonNull(container, ContainerConfig.DEFAULT_CONTAINER);
- return Objects.firstNonNull(config.getString(container,
CONCAT_BASE_CONFIG_PROPERTY),
+ return firstNonNull(config.getString(container,
CONCAT_BASE_CONFIG_PROPERTY),
concatBaseNoGadget);
}
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/HTMLContentRewriter.java
Fri Jun 5 22:58:00 2009
@@ -35,7 +35,6 @@
import java.util.List;
import java.util.Set;
-import com.google.common.base.Nullable;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -147,7 +146,7 @@
// Filter to just style tags
Iterable<Element> styleTags =
Lists.newArrayList(Iterables.filter(elementList,
new Predicate<Element>() {
- public boolean apply(@Nullable Element element) {
+ public boolean apply(Element element) {
return element.getNodeName().equalsIgnoreCase("style");
}
}));
@@ -177,7 +176,7 @@
// Filter to just stylesheet link tags
List<Element> linkTags = Lists.newArrayList(Iterables.filter(elementList,
new Predicate<Element>() {
- public boolean apply(@Nullable Element element) {
+ public boolean apply(Element element) {
return element.getNodeName().equalsIgnoreCase("link") &&
("stylesheet".equalsIgnoreCase(element.getAttribute("rel")) ||
element.getAttribute("type").toLowerCase().contains("css"));
@@ -216,7 +215,7 @@
// Filter to just script tags
List<Element> scriptTags = Lists.newArrayList(Iterables.filter(elementList,
new Predicate<Element>() {
- public boolean apply(@Nullable Element node) {
+ public boolean apply(Element node) {
if (node.getNodeName().equalsIgnoreCase("script")) {
String type = node.getAttribute("type");
return type == null || type.length() == 0 ||
type.equalsIgnoreCase(JS_MIME_TYPE);
@@ -261,7 +260,7 @@
// Filter to just style tags
Iterable<Element> tags = Iterables.filter(elementList, new
Predicate<Element>() {
- public boolean apply(@Nullable Element node) {
+ public boolean apply(Element node) {
return tagNames.contains(node.getNodeName().toLowerCase());
}
});
@@ -285,7 +284,7 @@
final String attr) {
// Filter out excluded URLs
tags = Lists.newArrayList(Iterables.filter(tags, new Predicate<Element>() {
- public boolean apply(@Nullable Element element) {
+ public boolean apply(Element element) {
return (element.hasAttribute(attr) &&
feature.shouldRewriteURL(element.getAttribute(attr)));
}
}));
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
Fri Jun 5 22:58:00 2009
@@ -26,6 +26,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
@@ -153,7 +154,7 @@
ImageWriteParam writeParam;
public ImageIOOutputter(ImageWriter writer, ImageWriteParam writeParam) {
this.writer = writer;
- this.writeParam = Objects.firstNonNull(writeParam,
writer.getDefaultWriteParam());
+ this.writeParam = firstNonNull(writeParam,
writer.getDefaultWriteParam());
}
public byte[] toBytes(BufferedImage image) throws IOException {
@@ -197,4 +198,7 @@
}
}
}
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Fri Jun 5 22:58:00 2009
@@ -19,7 +19,7 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.variables.Substitutions;
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -532,11 +532,13 @@
}
buf.append(">\n");
- Join.join(buf, "\n", preloads);
- Join.join(buf, "\n", features.values());
- Join.join(buf, "\n", icons);
- Join.join(buf, "\n", locales.values());
- Join.join(buf, "\n", links.values());
+ Joiner j = Joiner.on("\n");
+
+ j.appendTo(buf, preloads);
+ j.appendTo(buf, features.values());
+ j.appendTo(buf, icons);
+ j.appendTo(buf, locales.values());
+ j.appendTo(buf, links.values());
if (oauth != null) {
buf.append(oauth).append('\n');
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=782158&r1=782157&r2=782158&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
Fri Jun 5 22:58:00 2009
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -145,7 +145,7 @@
HttpResponse resp = b.create();
// Insure that headers are stored in the order they are added
- assertEquals(Join.join(",",resp.getHeaders("Soup")), Join.join(",",
soupList));
+ assertEquals(Joiner.on(",").join(resp.getHeaders("Soup")),
Joiner.on(",").join(soupList));
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
Fri Jun 5 22:58:00 2009
@@ -61,7 +61,7 @@
public void testGetServicesForContainer_OneContainerOneService() throws
Exception {
ImmutableSet<String> expectedServiceMethods =
ImmutableSet.of("system.listMethods");
- LinkedHashMultimap<String, String> expectedServices = new
LinkedHashMultimap<String, String>();
+ LinkedHashMultimap<String, String> expectedServices =
LinkedHashMultimap.create();
expectedServices.putAll(socialEndpoint, expectedServiceMethods);
String container = "ig";
svcLookup.setServicesFor(container, expectedServices);
@@ -77,7 +77,7 @@
Set<String> expectedServiceMethods = Sets.newHashSet("system.listMethods",
"people.get",
"people.update", "people.create", "people.delete");
- LinkedHashMultimap<String, String> expectedServices = new
LinkedHashMultimap<String, String>();
+ LinkedHashMultimap<String, String> expectedServices =
LinkedHashMultimap.create();
expectedServices.putAll(socialEndpoint, expectedServiceMethods);
String container = "ig";
@@ -92,10 +92,10 @@
"people.update", "people.create", "people.delete");
Set<String> expectedServiceMethods2 = Sets.newHashSet("cache.invalidate");
- LinkedHashMultimap<String, String> expectedServices = new
LinkedHashMultimap<String, String>();
+ LinkedHashMultimap<String, String> expectedServices =
LinkedHashMultimap.create();
expectedServices.putAll(socialEndpoint, expectedServiceMethods);
- LinkedHashMultimap<String, String> expectedServices2 = new
LinkedHashMultimap<String, String>();
+ LinkedHashMultimap<String, String> expectedServices2 =
LinkedHashMultimap.create();
expectedServices2.putAll(socialEndpoint2, expectedServiceMethods2);
String container = "ig";
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
Fri Jun 5 22:58:00 2009
@@ -26,10 +26,7 @@
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
+import com.google.common.collect.*;
import org.easymock.classextension.EasyMock;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -126,10 +123,10 @@
replay();
Multimap<String, String> services =
fetcher.getServicesForContainer("default", "dontcare");
verify();
- Multimap<String, String> mergedServices =
Multimaps.newLinkedHashMultimap(configuredServices);
+ Multimap<String, String> mergedServices =
LinkedHashMultimap.create(configuredServices);
mergedServices.putAll(endPoint1, endPoint1Services);
mergedServices.putAll(endPoint2, endPoint2Services);
- assertEquals(mergedServices, Multimaps.newLinkedHashMultimap(services));
+ assertEquals(mergedServices, LinkedHashMultimap.create(services));
}
public void testReadConfigBadContainer() throws Exception {
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Fri Jun 5 22:58:00 2009
@@ -40,7 +40,7 @@
import java.io.IOException;
import java.util.Map;
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
import com.google.common.collect.Maps;
/**
@@ -76,8 +76,8 @@
context.addEventListener(new GuiceServletContextListener());
Map<String, String> initParams = Maps.newHashMap();
- String modules = Join
- .join(":", SampleModule.class.getName(),
DefaultGuiceModule.class.getName(),
+ String modules = Joiner.on(":")
+ .join(SampleModule.class.getName(), DefaultGuiceModule.class.getName(),
PropertiesModule.class.getName(), OAuthModule.class.getName());
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE, modules);
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
Fri Jun 5 22:58:00 2009
@@ -49,7 +49,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.common.base.Join;
+import com.google.common.base.Joiner;
import com.google.common.collect.Maps;
/**
@@ -112,8 +112,8 @@
context.addEventListener(new GuiceServletContextListener());
Map<String, String> initParams = Maps.newHashMap();
- String modules = Join
- .join(":", SampleModule.class.getName(),
DefaultGuiceModule.class.getName(),
+ String modules = Joiner.on(":")
+ .join(SampleModule.class.getName(), DefaultGuiceModule.class.getName(),
PropertiesModule.class.getName(), OAuthModule.class.getName());
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE, modules);
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
Fri Jun 5 22:58:00 2009
@@ -19,6 +19,7 @@
import org.apache.shindig.social.opensocial.model.Activity;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
/**
* This represents atom:entry/atom:source for the Activity object.
@@ -35,7 +36,10 @@
*/
public AtomSource(Activity activity) {
title = activity.getStreamTitle();
- link = new AtomLink("self", Objects.firstNonNull(activity.getStreamUrl(),
"urn:bogus"));
+ link = new AtomLink("self", firstNonNull(activity.getStreamUrl(),
"urn:bogus"));
}
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
Fri Jun 5 22:58:00 2009
@@ -288,7 +288,7 @@
}
private static Multimap<String, Class<?>> getOmitMap(ConverterSet c) {
- return Objects.firstNonNull(omitMap.get(c),
omitMap.get(ConverterSet.DEFAULT));
+ return firstNonNull(omitMap.get(c), omitMap.get(ConverterSet.DEFAULT));
}
@@ -368,7 +368,7 @@
@SuppressWarnings("unchecked")
public V get(Object o) {
K key = (K)o;
- return Objects.firstNonNull(backing.get(key), backing.get(defaultval));
+ return firstNonNull(backing.get(key), backing.get(defaultval));
}
@Override
@@ -376,4 +376,8 @@
return backing;
}
}
+
+ public static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
Fri Jun 5 22:58:00 2009
@@ -29,6 +29,7 @@
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
@@ -142,9 +143,12 @@
@Operation(httpMethods = "GET", path="/@supportedFields")
public List<Object> supportedFields(RequestItem request) {
// TODO: Would be nice if name in config matched name of service.
- String container = Objects.firstNonNull(request.getToken().getContainer(),
- ContainerConfig.DEFAULT_CONTAINER);
+ String container = firstNonNull(request.getToken().getContainer(),
ContainerConfig.DEFAULT_CONTAINER);
return config.getList(container,
"${Cur['gadgets.features']['opensocial-0.8'].supportedFields.activity}");
}
+
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
Fri Jun 5 22:58:00 2009
@@ -32,6 +32,7 @@
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
@@ -112,8 +113,12 @@
@Operation(httpMethods = "GET", path="/@supportedFields")
public List<Object> supportedFields(RequestItem request) {
// TODO: Would be nice if name in config matched name of service.
- String container = Objects.firstNonNull(request.getToken().getContainer(),
"default");
+ String container = firstNonNull(request.getToken().getContainer(),
"default");
return config.getList(container,
"${Cur['gadgets.features']['opensocial-0.8'].supportedFields.person}");
}
+
+ private static <T> T firstNonNull(T first, T second) {
+ return first != null ? first : Preconditions.checkNotNull(second);
+ }
}
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=782158&r1=782157&r2=782158&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Fri Jun 5 22:58:00 2009
@@ -1273,7 +1273,7 @@
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
- <version>0.9</version>
+ <version>1.0-rc2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
