svn commit: r800216 - in /incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial: model/EnumUtil.java service/PersonHandler.java service/SocialRequestItem.java

[lindner]

Author: lindner
Date: Mon Aug  3 06:41:29 2009
New Revision: 800216

URL: http://svn.apache.org/viewvc?rev=800216&view=rev
Log:
use more ImmutableSets

Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.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/SocialRequestItem.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java?rev=800216&r1=800215&r2=800216&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java
 Mon Aug  3 06:41:29 2009
@@ -18,8 +18,7 @@
 
 package org.apache.shindig.social.opensocial.model;
 
-
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 
 import java.util.Collections;
 import java.util.Set;
@@ -42,13 +41,16 @@
    */
   // TODO: Because we have a Enum interface in this package we have to 
explicitly state the java.lang.Enum (bad ?)
   public static Set<String> getEnumStrings(java.lang.Enum<?>... vals) {
-    Set<String> result = Sets.newHashSet();
+    ImmutableSet.Builder<String> builder = ImmutableSet.builder();
     for (java.lang.Enum<?> v : vals) {
-      result.add(v.toString());
+      builder.add(v.toString());
     }
+    Set<String> result = builder.build();
+
     if (result.size() != vals.length) {
       throw new IllegalArgumentException("Enum names are not disjoint set");
     }
-    return Collections.unmodifiableSet(result);
+
+    return result;
   }
 }

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=800216&r1=800215&r2=800216&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 Aug  3 06:41:29 2009
@@ -95,12 +95,12 @@
             options, fields, request.getToken());
         return FutureUtil.getFirstFromCollection(people);
       } else {
-        Set<UserId> personIds = Sets.newLinkedHashSet();
+        ImmutableSet.Builder<UserId> personIds = ImmutableSet.builder();
         for (String pid : optionalPersonId) {
           personIds.add(new UserId(UserId.Type.userId, pid));
         }
         // Every other case is a collection response of optional person ids
-        return personService.getPeople(personIds, new 
GroupId(GroupId.Type.self, null),
+        return personService.getPeople(personIds.build(), new 
GroupId(GroupId.Type.self, null),
             options, fields, request.getToken());
       }
     }

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java?rev=800216&r1=800215&r2=800216&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
 Mon Aug  3 06:41:29 2009
@@ -31,6 +31,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
@@ -57,16 +58,16 @@
     if (ids.isEmpty()) {
       if (token.getViewerId() != null) {
         // Assume @me
-        ids = Lists.newArrayList("@me");
+        return ImmutableSet.of(UserId.fromJson("@me"));
       } else {
         throw new IllegalArgumentException("No userId provided and viewer not 
available");
       }
     }
-    Set<UserId> userIds = Sets.newLinkedHashSet();
+    ImmutableSet.Builder<UserId> userIds = ImmutableSet.builder();
     for (String id : ids) {
       userIds.add(UserId.fromJson(id));
     }
-    return userIds;
+    return userIds.build();
   }
 
   public GroupId getGroup() {