You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ja...@apache.org on 2010/07/21 16:45:08 UTC
svn commit: r966261 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/protocol/
gadgets/src/main/java/org/apache/shindig/gadgets/servlet/
gadgets/src/test/java/org/apache/shindig/gadgets/http/
gadgets/src/test/java/org/apache/shindig/ga...
Author: jasvir
Date: Wed Jul 21 14:45:08 2010
New Revision: 966261
URL: http://svn.apache.org/viewvc?rev=966261&view=rev
Log:
Simple clean up
* getting rid of the unused imports
* added .equals() on classes that have a .compare()
* corrected misuse of == instead of .equals() for testing strings
* replace repeated string concat with a stringbuffer
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=966261&r1=966260&r2=966261&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Wed Jul 21 14:45:08 2010
@@ -26,6 +26,7 @@ import org.apache.shindig.protocol.conve
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import org.apache.shindig.protocol.multipart.FormDataItem;
+import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -620,6 +621,22 @@ public class DefaultHandlerRegistry impl
return new RestInvocationWrapper(parsedParams, handler);
}
+ @Override
+ public boolean equals(Object other) {
+ if (other instanceof RestPath) {
+ RestPath that = (RestPath)other;
+ return (this.constCount == that.constCount &&
+ this.lastConstIndex == that.lastConstIndex &&
+ Objects.equal(this.operationPath, that.operationPath));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.constCount ^ this.lastConstIndex ^ operationPath.hashCode();
+ }
+
/**
* Rank based on the number of consant parts they accept, where the constant parts occur
* and lexical ordering.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=966261&r1=966260&r2=966261&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Wed Jul 21 14:45:08 2010
@@ -18,7 +18,6 @@
*/
package org.apache.shindig.gadgets.servlet;
-import com.google.caja.lexer.CharProducer;
import com.google.caja.lexer.ExternalReference;
import com.google.caja.lexer.FetchedData;
import com.google.caja.lexer.InputSource;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java?rev=966261&r1=966260&r2=966261&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java Wed Jul 21 14:45:08 2010
@@ -68,8 +68,6 @@ public class DefaultInvalidationServiceT
appyToken.setOwnerId("OwnerY");
appyToken.setViewerId("ViewerY");
- control = EasyMock.createNiceControl();
-
signedRequest = new HttpRequest(URI);
signedRequest.setAuthType(AuthType.SIGNED);
signedRequest.setSecurityToken(appxToken);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=966261&r1=966260&r2=966261&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Wed Jul 21 14:45:08 2010
@@ -75,15 +75,19 @@ public class ProxyHandlerTest extends Se
throws Exception {
setupProxyRequestBase(host);
expect(request.getHeader("Host")).andReturn(host);
- String query = (url != null ? "url=" + Utf8UrlCoder.encode(url) + '&' : "")
- + "container=default";
+ StringBuffer query = new StringBuffer("");
+ if (null != url) {
+ query.append("url=").append(Utf8UrlCoder.encode(url)).append('&');
+ }
+ query.append("container=default");
String[] params = extraParams;
if (params != null && params.length > 0) {
for (int i = 0; i < params.length; i += 2) {
- query += '&' + params[i] + '=' + Utf8UrlCoder.encode(params[i+1]);
+ query.append('&').append(params[i]).append('=').append(
+ Utf8UrlCoder.encode(params[i+1]));
}
}
- expect(request.getQueryString()).andReturn(query);
+ expect(request.getQueryString()).andReturn(query.toString());
}
private void setupFailedProxyRequestMock(String host, String url) throws Exception {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=966261&r1=966260&r2=966261&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java Wed Jul 21 14:45:08 2010
@@ -409,7 +409,7 @@ public class DefaultProxyUriManagerTest
assertEquals(orig, proxyUri.getResource());
assertEquals(debug, proxyUri.isDebug());
assertEquals(noCache, proxyUri.isNoCache());
- assertEquals(noCache ? new Integer(0) : refresh, proxyUri.getRefresh());
+ assertEquals(noCache ? Integer.valueOf(0) : refresh, proxyUri.getRefresh());
assertEquals(CONTAINER, proxyUri.getContainer());
assertEquals(SPEC_URI.toString(), proxyUri.getGadget());