Author: lindner
Date: Wed Jun 24 17:23:20 2009
New Revision: 788090
URL: http://svn.apache.org/viewvc?rev=788090&view=rev
Log:
Use ImmutableSet in a few more places, main benefit is singleton set in
PersonHandler
Modified:
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/ContentRewriterFeatureFactory.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
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=788090&r1=788089&r2=788090&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
Wed Jun 24 17:23:20 2009
@@ -143,13 +143,13 @@
private Set<String> getServicesFromJsonResponse(String content)
throws JSONException {
- Set<String> services = Sets.newHashSet();
+ ImmutableSet.Builder<String> services = ImmutableSet.builder();
JSONObject js = new JSONObject(content);
JSONArray json = js.getJSONArray(JSON_RESPONSE_WRAPPER_ELEMENT);
for (int i = 0; i < json.length(); i++) {
String o = json.getString(i);
services.add(o);
}
- return services;
+ return services.build();
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java?rev=788090&r1=788089&r2=788090&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java
Wed Jun 24 17:23:20 2009
@@ -24,6 +24,7 @@
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -57,12 +58,14 @@
this.includeUrls = includeUrls;
this.excludeUrls = excludeUrls;
this.expires = expires;
- this.includeTags = Sets.newHashSet();
- for (String s : includeTags.split(",")) {
- if (s != null && s.trim().length() > 0) {
- this.includeTags.add(s.trim().toLowerCase());
+
+ ImmutableSet.Builder<String> includeTagsBuilder = ImmutableSet.builder();
+ for (String s : includeTags.trim().toLowerCase().split("\\s*,\\s*")) {
+ if (s != null && s.length() > 0) {
+ includeTagsBuilder.add(s);
}
}
+ this.includeTags = includeTagsBuilder.build();
defaultFeature = new ContentRewriterFeature(null, includeUrls,
excludeUrls, expires,
this.includeTags);
}
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=788090&r1=788089&r2=788090&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
Wed Jun 24 17:23:20 2009
@@ -87,7 +87,7 @@
}
} else if (optionalPersonId.size() == 1) {
// TODO: Add some crazy concept to handle the userId?
- Set<UserId> optionalUserIds = Sets.newHashSet(
+ Set<UserId> optionalUserIds = ImmutableSet.of(
new UserId(UserId.Type.userId,
optionalPersonId.iterator().next()));
Future<RestfulCollection<Person>> people = personService.getPeople(
