You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/08 22:16:46 UTC
svn commit: r952802 - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/as/sample/
java/common/src/main/java/org/apache/shindig/protocol/
java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/
java/gadgets/src/main/java/o...
Author: lindner
Date: Tue Jun 8 20:16:45 2010
New Revision: 952802
URL: http://svn.apache.org/viewvc?rev=952802&view=rev
Log:
more simple cleanups, char consts, etc.
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
Modified: shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java (original)
+++ shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java Tue Jun 8 20:16:45 2010
@@ -189,7 +189,7 @@ public class ActivityStreamsJsonDbServic
JSONObject actor = new JSONObject(activityEntry.get(ActivityEntry.Field.ACTOR.toString()));
String actorId = actor.get(ActivityObject.Field.ID.toString()).toString();
if (actorId.equals(user)
- && activityIds.contains(activityEntry.getString(ActivityEntry.Field.ID.toString()).toString())) {
+ && activityIds.contains(activityEntry.getString(ActivityEntry.Field.ID.toString()))) {
result.add(jsonDb.filterFields(activityEntry, fields, ActivityEntry.class));
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java Tue Jun 8 20:16:45 2010
@@ -176,7 +176,7 @@ public class DataServiceServlet extends
String callback = (HttpUtil.isJSONP(servletRequest) && ContentTypes.OUTPUT_JSON_CONTENT_TYPE.equals(converter.getContentType())) ?
servletRequest.getParameter("callback") : null;
- if (callback != null) writer.write(callback + "(");
+ if (callback != null) writer.write(callback + '(');
writer.write(converter.convertToString(response));
if (callback != null) writer.write(");\n");
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Tue Jun 8 20:16:45 2010
@@ -456,7 +456,7 @@ public class NekoSimplifiedHtmlParser ex
* if the first parsed tags are allowed in a head tag.
* See https://sourceforge.net/tracker/?func=detail&atid=952178&aid=2870180&group_id=195122
*/
- private class NekoPatchTagBalancer extends NormalizingTagBalancer {
+ private static class NekoPatchTagBalancer extends NormalizingTagBalancer {
/**
* Override the document start to record whether HTML, HEAD or BODY have been seen
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=952802&r1=952801&r2=952802&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 Tue Jun 8 20:16:45 2010
@@ -215,7 +215,7 @@ public class CajaContentRewriter impleme
String messageText = msg.getMessageLevel().name() + ' ' +
html(msg.format(mc)) + ':' + snippet;
Element li = doc.createElement("li");
- li.appendChild(doc.createTextNode(messageText.toString()));
+ li.appendChild(doc.createTextNode(messageText));
errElement.appendChild(li);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java Tue Jun 8 20:16:45 2010
@@ -115,7 +115,7 @@ public class HtmlAccelServlet extends Ga
public String getParameter(String name) {
if (requestParams.containsKey(name)) {
List<String> values = requestParams.get(name);
- if (values != null && values.size() > 0) return values.get(0);
+ if (values != null && !values.isEmpty()) return values.get(0);
}
return null;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/MessageELResolver.java Tue Jun 8 20:16:45 2010
@@ -72,7 +72,7 @@ public class MessageELResolver extends E
context.setPropertyResolved(true);
return bundle;
} else if (base instanceof MessageBundle) {
- String text = bundle.getMessages().get(property);
+ String text = bundle.getMessages().get(property.toString());
if (text == null) {
context.setPropertyResolved(true);
return null;
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java Tue Jun 8 20:16:45 2010
@@ -167,7 +167,7 @@ public class DefaultGadgetSpecFactoryTes
@Test
public void specFetchedWithBomChar() throws Exception {
HttpRequest request = createIgnoreCacheRequest();
- HttpResponse response = new HttpResponse("\uFEFF" + LOCAL_SPEC_XML);
+ HttpResponse response = new HttpResponse('\uFEFF' + LOCAL_SPEC_XML);
expect(pipeline.execute(request)).andReturn(response);
replay(pipeline);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java Tue Jun 8 20:16:45 2010
@@ -640,7 +640,7 @@ public class RenderingGadgetRewriterTest
String oAuthBlock = "";
String authzAttr = "";
if (auth != null) {
- authzAttr = " authz='" + auth + "'";
+ authzAttr = " authz='" + auth + '\'';
if ("oauth".equals(auth)) {
if (oauthService != null) {
oAuthBlock =
@@ -649,10 +649,10 @@ public class RenderingGadgetRewriterTest
"<Request url='http://bar' method='GET' />" +
"<Authorization url='http://baz' />" +
"</Service></OAuth>";
- authzAttr += " oauth_service_name='" + oauthService + "'";
+ authzAttr += " oauth_service_name='" + oauthService + '\'';
}
if (oauthToken != null) {
- authzAttr += " oauth_token_name='" + oauthToken + "'";
+ authzAttr += " oauth_token_name='" + oauthToken + '\'';
}
}
}
@@ -665,12 +665,12 @@ public class RenderingGadgetRewriterTest
"<Content type='html' href='http://foo.com/bar/baz.html'" + authzAttr + " />" +
"</Module>";
- String expected = "{" +
+ String expected = '{' +
(oauthService == null ? "" : "\"oauthService\":\"serviceName\",") +
"\"contentUrl\":\"http://foo.com/bar/baz.html\"" +
- (auth == null ? "" : ",\"authorization\":\"" + auth + "\"") +
+ (auth == null ? "" : ",\"authorization\":\"" + auth + '\"') +
(oauthToken == null ? "" : ",\"oauthTokenName\":\"tokenName\"") +
- "}";
+ '}';
Gadget gadget = makeGadgetWithSpec(gadgetXml);
gadget.setCurrentView(gadget.getSpec().getView("default"));
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java Tue Jun 8 20:16:45 2010
@@ -243,7 +243,7 @@ public class ActivityServiceDb implement
q.setFirstResult(0);
q.setMaxResults(1);
List<?> activities = q.getResultList();
- if ( activities != null && activities.size() > 0 ) {
+ if ( activities != null && !activities.isEmpty()) {
return (Activity) activities.get(0);
}
return null;
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=952802&r1=952801&r2=952802&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Tue Jun 8 20:16:45 2010
@@ -165,7 +165,7 @@ public class PersonServiceDb implements
q.setMaxResults(1);
List<?> plist = q.getResultList();
Person person = null;
- if (plist != null && plist.size() > 0) {
+ if (plist != null && !plist.isEmpty()) {
person = (Person) plist.get(0);
}
return ImmediateFuture.newInstance(person);