svn commit: r659580 - in /incubator/shindig/trunk/java/social-api/src: main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java

[doll]

Author: doll
Date: Fri May 23 09:15:07 2008
New Revision: 659580

URL: http://svn.apache.org/viewvc?rev=659580&view=rev
Log:
When a null or empty key set is passed into the data service it will now return 
all of the keys in the set. (Before it returned nothing)

Fixed both samplecontainer and mock code. 


Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java?rev=659580&r1=659579&r2=659580&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
 Fri May 23 09:15:07 2008
@@ -52,14 +52,19 @@
     for (String id : ids) {
       Map<String, String> allPersonData = allData.get(id);
       if (allPersonData != null) {
-        Map<String, String> personData = new HashMap<String, String>();
-        for (String key : allPersonData.keySet()) {
-          if (keys.contains(key)) {
-            personData.put(key, allPersonData.get(key));
+        if (keys == null || keys.isEmpty()) {
+          data.put(id, allPersonData);
+        } else {
+          Map<String, String> personData = new HashMap<String, String>();
+          for (String key : keys) {
+            String value = allPersonData.get(key);
+            if (value != null) {
+              personData.put(key, value);
+            }
           }
+          data.put(id, personData);
         }
 
-        data.put(id, personData);
       }
     }
 

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=659580&r1=659579&r2=659580&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
 Fri May 23 09:15:07 2008
@@ -154,7 +154,7 @@
       johnsFriends.add(simpleDoe.getId());
       friendIds.put(johnDoe.getId(), johnsFriends);
 
-      // John is Jane's friend.      
+      // John is Jane's friend.
       List<String> janesFriends = new ArrayList<String>();
       janesFriends.add(johnDoe.getId());
       friendIds.put(janeDoe.getId(), janesFriends);
@@ -229,12 +229,17 @@
 
         // Filter by keys
         Map<String, String> personDataToReturn = new HashMap<String, String>();
-        if (keys != null) {
+
+        if (keys == null || keys.isEmpty()) {
+          personDataToReturn = allPersonData;
+        } else {
           for (String key : keys) {
-            personDataToReturn.put(key, allPersonData.get(key));
+            String value = allPersonData.get(key);
+            if (value != null) {
+              personDataToReturn.put(key, value);
+            }
           }
-        } else {
-          personDataToReturn = allPersonData;
+
         }
 
         dataToReturn.put(id, personDataToReturn);