You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ja...@gmail.com on 2010/07/12 09:33:26 UTC
Cleaning up warnings (issue1807042)
Reviewers: johnfargo,
Description:
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
Please review this at http://codereview.appspot.com/1807042/show
Affected files:
M
java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
M
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
M
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
M
java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
M
java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
M
java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
Index:
java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
===================================================================
---
java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
(revision 961963)
+++
java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
(working copy)
@@ -620,6 +620,17 @@
return new RestInvocationWrapper(parsedParams, handler);
}
+ @Override
+ public boolean equals(Object other) {
+ if (other instanceof RestPath) {
+ RestPath that = (RestPath)other;
+ return (that.constCount == this.constCount &&
+ that.lastConstIndex == this.lastConstIndex &&
+ that.operationPath == this.operationPath);
+ }
+ return false;
+ }
+
/**
* Rank based on the number of consant parts they accept, where the
constant parts occur
* and lexical ordering.
Index:
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
===================================================================
---
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
(revision 961963)
+++
java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
(working copy)
@@ -68,8 +68,6 @@
appyToken.setOwnerId("OwnerY");
appyToken.setViewerId("ViewerY");
- control = EasyMock.createNiceControl();
-
signedRequest = new HttpRequest(URI);
signedRequest.setAuthType(AuthType.SIGNED);
signedRequest.setSecurityToken(appxToken);
Index:
java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
===================================================================
---
java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
(revision 961963)
+++
java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
(working copy)
@@ -62,7 +62,7 @@
private static final GadgetContext ACCEL_CONTEXT = new GadgetContext() {
@Override
public String getParameter(String name) {
- if (name == HtmlAccelServlet.ACCEL_GADGET_PARAM_NAME) {
+ if (HtmlAccelServlet.ACCEL_GADGET_PARAM_NAME.equals(name)) {
return HtmlAccelServlet.ACCEL_GADGET_PARAM_VALUE;
}
return super.getParameter(name);
Index:
java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
===================================================================
---
java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
(revision 961963)
+++
java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
(working copy)
@@ -75,15 +75,16 @@
throws Exception {
setupProxyRequestBase(host);
expect(request.getHeader("Host")).andReturn(host);
- String query = (url != null ? "url=" + Utf8UrlCoder.encode(url)
+ '&' : "")
- + "container=default";
+ StringBuffer query = new StringBuffer(
+ url != null ? "url=" + Utf8UrlCoder.encode(url) + '&' : "");
+ 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('&' + params[i] + '=' +
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 {
Index:
java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
===================================================================
---
java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
(revision 961963)
+++
java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
(working copy)
@@ -409,7 +409,7 @@
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());
Index:
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
===================================================================
---
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
(revision 961963)
+++
java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
(working copy)
@@ -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;