Author: lindner
Date: Mon Jan 26 08:30:13 2009
New Revision: 737649
URL: http://svn.apache.org/viewvc?rev=737649&view=rev
Log:
minor cleanups for hashCode, isEmpty(), append
Added:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.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/servlet/MakeRequestHandlerTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/NullPropertyFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.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/DataServiceServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ResponseItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
Mon Jan 26 08:30:13 2009
@@ -68,7 +68,7 @@
public BasicSecurityToken(String owner, String viewer, String app,
String domain, String appUrl, String moduleId, String container) throws
BlobCrypterException {
- tokenData = Maps.newHashMapWithExpectedSize(6);
+ tokenData = Maps.newHashMapWithExpectedSize(7);
putNullSafe(OWNER_KEY, owner);
putNullSafe(VIEWER_KEY, viewer);
putNullSafe(APP_KEY, app);
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
Mon Jan 26 08:30:13 2009
@@ -160,8 +160,7 @@
throws UnsupportedEncodingException {
StringBuilder sb = new StringBuilder();
- for (Map.Entry<String, String> stringStringEntry : in.entrySet()) {
- Map.Entry<String, String> val = stringStringEntry;
+ for (Map.Entry<String, String> val : in.entrySet()) {
sb.append(URLEncoder.encode(val.getKey(), UTF8));
sb.append('=');
sb.append(URLEncoder.encode(val.getValue(), UTF8));
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
Mon Jan 26 08:30:13 2009
@@ -28,6 +28,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import com.google.common.base.Objects;
+
/**
* Represents a javascript library, either as an external resource (url)
* or as an inline script.
@@ -239,7 +241,7 @@
@Override
public int hashCode() {
- return content.hashCode() + type.hashCode();
+ return Objects.hashCode(content, type);
}
@Override
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
Mon Jan 26 08:30:13 2009
@@ -502,23 +502,23 @@
*/
@SuppressWarnings("unchecked")
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- httpStatusCode = in.readInt();
- Map<String, List<String>> headerCopy = (Map<String,
List<String>>)in.readObject();
- int bodyLength = in.readInt();
- responseBytes = new byte[bodyLength];
- int cnt, offset = 0;
- while ((cnt = in.read(responseBytes, offset, bodyLength)) > 0) {
- offset += cnt;
- bodyLength -= cnt;
- }
- if (offset != responseBytes.length) {
- throw new IOException("Invalid body! Expected length = " +
responseBytes.length + ", bytes readed = " + offset + ".");
- }
+ httpStatusCode = in.readInt();
+ Map<String, List<String>> headerCopy = (Map<String,
List<String>>)in.readObject();
+ int bodyLength = in.readInt();
+ responseBytes = new byte[bodyLength];
+ int cnt, offset = 0;
+ while ((cnt = in.read(responseBytes, offset, bodyLength)) > 0) {
+ offset += cnt;
+ bodyLength -= cnt;
+ }
+ if (offset != responseBytes.length) {
+ throw new IOException("Invalid body! Expected length = " +
responseBytes.length + ", bytes readed = " + offset + '.');
+ }
- date = getAndUpdateDate(headerCopy);
- encoding = getAndUpdateEncoding(headerCopy, responseBytes);
- headers = Collections.unmodifiableMap(headerCopy);
- metadata = Collections.emptyMap();
+ date = getAndUpdateDate(headerCopy);
+ encoding = getAndUpdateEncoding(headerCopy, responseBytes);
+ headers = Collections.unmodifiableMap(headerCopy);
+ metadata = Collections.emptyMap();
}
public void writeExternal(ObjectOutput out) throws IOException {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
Mon Jan 26 08:30:13 2009
@@ -19,8 +19,10 @@
package org.apache.shindig.gadgets.oauth;
+import com.google.common.base.Objects;
+
/**
- * Index into the token store by
+ * Index into the token store by
*/
public class BasicOAuthStoreConsumerIndex {
private String gadgetUri;
@@ -41,13 +43,7 @@
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result =
- prime * result + ((gadgetUri == null) ? 0 : gadgetUri.hashCode());
- result =
- prime * result + ((serviceName == null) ? 0 : serviceName.hashCode());
- return result;
+ return Objects.hashCode(gadgetUri, serviceName);
}
@Override
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
Mon Jan 26 08:30:13 2009
@@ -19,8 +19,10 @@
package org.apache.shindig.gadgets.oauth;
+import com.google.common.base.Objects;
+
/**
- *
+ *
*/
public class BasicOAuthStoreTokenIndex {
@@ -63,17 +65,7 @@
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
- result =
- prime * result + ((gadgetUri == null) ? 0 : gadgetUri.hashCode());
- result = prime * result + (int) (moduleId ^ (moduleId >>> 32));
- result =
- prime * result + ((serviceName == null) ? 0 : serviceName.hashCode());
- result =
- prime * result + ((tokenName == null) ? 0 : tokenName.hashCode());
- result = prime * result + ((userId == null) ? 0 : userId.hashCode());
- return result;
+ return Objects.hashCode(gadgetUri, moduleId, serviceName, tokenName,
userId);
}
@Override
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
Mon Jan 26 08:30:13 2009
@@ -140,11 +140,10 @@
accessorBuilder.setParameterLocation(
getStoreLocation(service.getRequestUrl().location, responseParams));
accessorBuilder.setMethod(getStoreMethod(service.getRequestUrl().method,
responseParams));
- OAuthServiceProvider provider = new OAuthServiceProvider(
+ return new OAuthServiceProvider(
service.getRequestUrl().url.toJavaUri().toASCIIString(),
service.getAuthorizationUrl().toJavaUri().toASCIIString(),
service.getAccessUrl().url.toJavaUri().toASCIIString());
- return provider;
}
/**
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
Mon Jan 26 08:30:13 2009
@@ -76,13 +76,12 @@
// TODO: move somewhere more sensible
public static HttpRequest newHttpRequest(GadgetContext context,
RequestAuthenticationInfo authenticationInfo) throws GadgetException {
- HttpRequest request = new HttpRequest(authenticationInfo.getHref())
+ return new HttpRequest(authenticationInfo.getHref())
.setSecurityToken(context.getToken())
.setOAuthArguments(new OAuthArguments(authenticationInfo))
.setAuthType(authenticationInfo.getAuthType())
.setContainer(context.getContainer())
.setGadget(Uri.fromJavaUri(context.getUrl()));
- return request;
}
class PreloadTask implements Callable<PreloadedData> {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
Mon Jan 26 08:30:13 2009
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import com.google.common.base.Objects;
import org.apache.shindig.gadgets.spec.Feature;
import org.apache.shindig.gadgets.spec.GadgetSpec;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
Mon Jan 26 08:30:13 2009
@@ -103,7 +103,7 @@
throwCajolingException(e, mq);
return RewriterResults.notCacheable();
}
- content.setContent(tameCajaClientApi() + output.toString());
+ content.setContent(tameCajaClientApi() + output);
}
return null;
}
@@ -126,7 +126,7 @@
errbuilder.append(m.format(mc)).append('\n');
}
- logger.info("Unable to cajole gadget: " + errbuilder.toString());
+ logger.info("Unable to cajole gadget: " + errbuilder);
// throw new GadgetException(
// GadgetException.Code.MALFORMED_FOR_SAFE_INLINING,
errbuilder.toString());
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
Mon Jan 26 08:30:13 2009
@@ -75,6 +75,7 @@
// Process all JSON first so that we don't wind up with hanging threads if
// a JSONException is thrown.
gadgets = Lists.newArrayListWithExpectedSize(requestedGadgets.length());
+
for (int i = 0, j = requestedGadgets.length(); i < j; ++i) {
GadgetContext context = new JsonRpcGadgetContext(
requestContext, requestedGadgets.getJSONObject(i));
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
Mon Jan 26 08:30:13 2009
@@ -69,8 +69,7 @@
OAuthService service = serviceMap.get(name);
sb.append(service.getRequestUrl().toString("Request"));
sb.append(service.getAccessUrl().toString("Access"));
- sb.append("<Authorization url='" +
- service.getAuthorizationUrl().toString() + "'/>");
+ sb.append("<Authorization
url='").append(service.getAuthorizationUrl().toString()).append("'/>");
sb.append("</Service>");
}
sb.append("</OAuth>");
Added:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java?rev=737649&view=auto
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
(added)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
Mon Jan 26 08:30:13 2009
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.gadgets.oauth;
+
+import org.junit.Test;
+import junitx.extensions.EqualsHashCodeTestCase;
+import static junitx.framework.Assert.assertNotEquals;
+
+public class BasicOAuthStoreTokenIndexTest extends EqualsHashCodeTestCase {
+ public BasicOAuthStoreTokenIndexTest() { super("TestHashCodeEquals");}
+
+ protected Object createInstance() throws Exception {
+ BasicOAuthStoreTokenIndex eq = new BasicOAuthStoreTokenIndex();
+ eq.setGadgetUri("http://www.example.com/foo";);
+ eq.setModuleId(100000000);
+ eq.setServiceName("test");
+ eq.setUserId("abc");
+ return eq;
+ }
+
+ protected Object createNotEqualInstance() throws Exception {
+ return new BasicOAuthStoreTokenIndex();
+ }
+
+
+ @Test
+ public void testHashCode() {
+ BasicOAuthStoreTokenIndex eq1 = new BasicOAuthStoreTokenIndex();
+ BasicOAuthStoreTokenIndex eq2 = new BasicOAuthStoreTokenIndex();
+
+ // just be sure that our new hashcode method works
+ eq1.setModuleId(100);
+ eq2.setModuleId(200);
+ assertNotEquals(eq1.hashCode(), eq2.hashCode());
+
+ }
+}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
Mon Jan 26 08:30:13 2009
@@ -44,10 +44,7 @@
private ParsedCssRule makeParsedRule(String[] selectors, String[][] decls) {
ParsedCssRule parsedMock = EasyMock.createNiceMock(ParsedCssRule.class);
- List<String> selectorList = Lists.newLinkedList();
- for (String sel : selectors) {
- selectorList.add(sel);
- }
+ List<String> selectorList = Lists.newLinkedList(selectors);
expect(parsedMock.getSelectors()).andReturn(selectorList).anyTimes();
List<ParsedCssDeclaration> declList = Lists.newLinkedList();
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=737649&r1=737648&r2=737649&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
Mon Jan 26 08:30:13 2009
@@ -772,7 +772,7 @@
@Override
public Collection<GadgetFeature> getFeatures(Collection<String> needed) {
- return getFeatures(needed, new HashSet<String>());
+ return getFeatures(needed, Sets.<String>newHashSet());
}
@Override
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
Mon Jan 26 08:30:13 2009
@@ -37,12 +37,12 @@
import org.json.JSONObject;
import org.junit.Test;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
+import com.google.common.collect.Lists;
+
/**
* Tests for MakeRequestHandler.
*/
@@ -230,17 +230,15 @@
}
private void expectParameters(HttpServletRequest request, String... params) {
- final Vector<String> v = new Vector<String>();
- for (String p : params) {
- v.add(p);
- }
+ final List<String> v = Lists.newArrayList(params);
+
expect(request.getParameterNames()).andStubAnswer(new
IAnswer<Enumeration<String>>() {
public Enumeration<String> answer() throws Throwable{
- return v.elements();
- }
+ return Collections.enumeration(v);
+ }
});
}
-
+
public void testSignedGetRequest() throws Exception {
expect(request.getAttribute(AuthInfo.Attribute.SECURITY_TOKEN.getId()))
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/NullPropertyFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/NullPropertyFilter.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/NullPropertyFilter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/NullPropertyFilter.java
Mon Jan 26 08:30:13 2009
@@ -41,7 +41,7 @@
}
if (value instanceof JSONArray) {
JSONArray array = (JSONArray) value;
- if (array.size() == 0) {
+ if (array.isEmpty()) {
return true;
}
}
@@ -53,7 +53,7 @@
}
if (value instanceof Collection) {
Collection<?> collection = (Collection<?>) value;
- if (collection.size() == 0) {
+ if (collection.isEmpty()) {
return true;
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
Mon Jan 26 08:30:13 2009
@@ -28,6 +28,7 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
/**
* represents an atom:feed entry
@@ -55,7 +56,7 @@
Preconditions.checkNotNull(obj);
if (obj instanceof Map) {
Map<?, ?> m = (Map<?, ?>) obj;
- entry = new ArrayList();
+ entry = Lists.newArrayList();
for ( Entry<?, ?> o : m.entrySet()) {
entry.add(new AtomEntry(o));
}
@@ -64,7 +65,7 @@
itemsPerPage = entry.size();
} else if (obj instanceof RestfulCollection<?>) {
RestfulCollection<?> r = (RestfulCollection<?>) obj;
- entry = new ArrayList();
+ entry = Lists.newArrayList();
List<?> entryList = r.getEntry();
for (Object o : entryList) {
entry.add(new AtomEntry(o));
@@ -76,7 +77,7 @@
link = new AtomLink("rel", "???");
} else if ( obj instanceof DataCollection ) {
DataCollection dc = (DataCollection) obj;
- entry = new ArrayList();
+ entry = Lists.newArrayList();
for ( Entry<String, Map<String,String>> o : dc.getEntry().entrySet()) {
entry.add(new AtomEntry(o));
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java
Mon Jan 26 08:30:13 2009
@@ -65,7 +65,7 @@
*/
public String pop() {
List<Object[]> stack = stackHolder.get();
- if (stack.size() == 0) {
+ if (stack.isEmpty()) {
return null;
} else {
Object[] o = stack.remove(stack.size() - 1);
@@ -98,7 +98,7 @@
*/
public Object peek(int i) {
List<Object[]> stack = stackHolder.get();
- if (stack.size() == 0) {
+ if (stack.isEmpty()) {
return null;
} else {
Object[] o = stack.get(stack.size() - 1);
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=737649&r1=737648&r2=737649&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
Mon Jan 26 08:30:13 2009
@@ -25,6 +25,7 @@
import com.google.common.collect.Sets;
import com.google.common.collect.Iterables;
+import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import java.util.List;
@@ -53,7 +54,7 @@
request.applyUrlTemplate(ACTIVITY_ID_PATH);
Set<UserId> userIds = request.getUsers();
- Set<String> activityIds =
Sets.newLinkedHashSet(request.getListParameter("activityId"));
+ Set<String> activityIds =
ImmutableSet.copyOf(request.getListParameter("activityId"));
Preconditions.requireNotEmpty(userIds, "No userId specified");
Preconditions.requireSingular(userIds, "Multiple userIds not supported");
@@ -108,7 +109,7 @@
request.applyUrlTemplate(ACTIVITY_ID_PATH);
Set<UserId> userIds = request.getUsers();
- Set<String> optionalActivityIds =
Sets.newLinkedHashSet(request.getListParameter("activityId"));
+ Set<String> optionalActivityIds =
ImmutableSet.copyOf(request.getListParameter("activityId"));
CollectionOptions options = new CollectionOptions(request);
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=737649&r1=737648&r2=737649&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
Mon Jan 26 08:30:13 2009
@@ -160,7 +160,7 @@
if (fields == null) {
return new ResponseItem(ResponseError.NOT_IMPLEMENTED,"Supported fields
not available for" +
- " service \"" + service + "\"");
+ " service \"" + service + '\"');
}
return new ResponseItem(toList(fields));
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=737649&r1=737648&r2=737649&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
Mon Jan 26 08:30:13 2009
@@ -26,6 +26,7 @@
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import java.util.Set;
import java.util.concurrent.Future;
@@ -34,7 +35,7 @@
private final PersonService personService;
private static final String PEOPLE_PATH =
"/people/{userId}+/{groupId}/{personId}+";
-
+
@Inject
public PersonHandler(PersonService personService) {
this.personService = personService;
@@ -64,7 +65,7 @@
protected Future<?> handleGet(RequestItem request) throws SocialSpiException
{
request.applyUrlTemplate(PEOPLE_PATH);
GroupId groupId = request.getGroup();
- Set<String> optionalPersonId =
Sets.newLinkedHashSet(request.getListParameter("personId"));
+ Set<String> optionalPersonId =
ImmutableSet.copyOf(request.getListParameter("personId"));
Set<String> fields = request.getFields(Person.Field.DEFAULT_FIELDS);
Set<UserId> userIds = request.getUsers();
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ResponseItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ResponseItem.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ResponseItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ResponseItem.java
Mon Jan 26 08:30:13 2009
@@ -102,9 +102,6 @@
@Override
public int hashCode() {
- int result = (error != null ? error.hashCode() : 0);
- result = 31 * result + (errorMessage != null ? errorMessage.hashCode() :
0);
- result = 31 * result + (response != null ? response.hashCode() : 0);
- return result;
+ return Objects.hashCode(error, errorMessage, response);
}
}
\ No newline at end of file
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
Mon Jan 26 08:30:13 2009
@@ -21,6 +21,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.base.Objects;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
@@ -185,7 +186,7 @@
// and so we simply ignore the parameter name
return getTypedParameters(dataTypeClass);
}
-
+
@Override
public <T> T getTypedParameters(Class<T> dataTypeClass) {
return converter.convertToObject(postData, dataTypeClass);
@@ -222,11 +223,7 @@
@Override
public String getParameter(String paramName, String defaultValue) {
- String result = getParameter(paramName);
- if (result == null) {
- return defaultValue;
- }
- return result;
+ return Objects.firstNonNull(getParameter(paramName), defaultValue);
}
/**
@@ -244,7 +241,7 @@
}
return stringList;
}
-
+
public String getUrl() {
return this.url;
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
Mon Jan 26 08:30:13 2009
@@ -23,6 +23,7 @@
import org.apache.shindig.social.ResponseError;
import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableList;
import org.json.JSONArray;
import org.json.JSONException;
@@ -97,7 +98,7 @@
return returnVal;
} else {
// Allow up-conversion of non-array to array params.
- return Lists.newArrayList(data.getString(paramName));
+ return ImmutableList.of(data.getString(paramName));
}
} else {
return Collections.emptyList();
@@ -115,7 +116,7 @@
throw new SocialSpiException(ResponseError.BAD_REQUEST, je.getMessage(),
je);
}
}
-
+
@Override
public<T> T getTypedParameters(Class<T> dataTypeClass) {
return converter.convertToObject(data.toString(), dataTypeClass);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=737649&r1=737648&r2=737649&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
Mon Jan 26 08:30:13 2009
@@ -444,7 +444,7 @@
String expected, Object field) {
List<String> v = result.get(field.toString());
String t = null;
- if ( v == null || v.size() == 0 ) {
+ if ( v == null || v.isEmpty()) {
if (expected == null ) {
return;
}
