Author: raminder
Date: Fri May 4 18:25:19 2012
New Revision: 1334111
URL: http://svn.apache.org/viewvc?rev=1334111&view=rev
Log:
apply patch by Fernando Pinhati. Thanks for the contribution. Rave-599
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java?rev=1334111&r1=1334110&r2=1334111&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
Fri May 4 18:25:19 2012
@@ -101,7 +101,8 @@ public class DefaultPersonService implem
List<org.apache.rave.portal.model.Person> people = new
ArrayList<org.apache.rave.portal.model.Person>();
for (UserId id : userIds) {
-
CollectionUtils.addUniqueValues(getFriendsFromRepository(collectionOptions,
token.getAppId(), id.getUserId(token)), people);
+ org.apache.rave.portal.model.Person person =
this.getPersonForId(id, token);
+
CollectionUtils.addUniqueValues(getFriendsFromRepository(collectionOptions,
token.getAppId(), person.getUsername()), people);
}
return people;
}
@@ -112,7 +113,8 @@ public class DefaultPersonService implem
List<org.apache.rave.portal.model.Person> people = new
ArrayList<org.apache.rave.portal.model.Person>();
for (UserId id : userIds) {
-
CollectionUtils.addUniqueValues(getConnectedPeopleFromRepository(collectionOptions,
token.getAppId(), id.getUserId(token)), people);
+ org.apache.rave.portal.model.Person person =
this.getPersonForId(id, token);
+
CollectionUtils.addUniqueValues(getConnectedPeopleFromRepository(collectionOptions,
token.getAppId(), person.getUsername()), people);
}
return people;
}
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java?rev=1334111&r1=1334110&r2=1334111&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
Fri May 4 18:25:19 2012
@@ -201,12 +201,16 @@ public class PersonServiceTest {
}
@Test
- @Ignore
public void getPeople_friends() throws ExecutionException,
InterruptedException {
Set<UserId> ids = getUserIdSet();
GroupId groupId = new GroupId(GroupId.Type.friends, GROUP_ID);
replay(token);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findFriends(ID_2)).andReturn(getDbPersonList());
expect(repository.findFriends(ID_3)).andReturn(getDbPersonList());
replay(repository);
@@ -267,6 +271,11 @@ public class PersonServiceTest {
options.setFilterOperation(FilterOperation.contains);
options.setFilterValue(value);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findAllConnectedPeople(ID_2, field,
FilterOperation.contains, value)).andReturn(getDbPersonList());
expect(repository.findAllConnectedPeople(ID_3, field,
FilterOperation.contains, value)).andReturn(getDbPersonList());
replay(repository);
@@ -288,6 +297,10 @@ public class PersonServiceTest {
options.setFilter(field);
options.setFilterOperation(FilterOperation.contains);
options.setFilterValue(value);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
expect(repository.findFriends(ID_2, field, FilterOperation.contains,
value)).andReturn(getDbPersonList());
expect(repository.findFriends(ID_3, field, FilterOperation.contains,
value)).andReturn(getDbPersonList());
@@ -310,6 +323,10 @@ public class PersonServiceTest {
options.setFilter(field);
options.setFilterOperation(FilterOperation.contains);
options.setFilterValue(value);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
expect(repository.findFriends(ID_2)).andReturn(getDbPersonList());
expect(repository.findFriends(ID_3)).andReturn(getDbPersonList());
@@ -332,6 +349,11 @@ public class PersonServiceTest {
String field = PersonService.HAS_APP_FILTER;
options.setFilter(field);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findFriends(ID_2,
appId)).andReturn(getDbPersonList());
expect(repository.findFriends(ID_3,
appId)).andReturn(getDbPersonList());
replay(repository);
@@ -353,6 +375,11 @@ public class PersonServiceTest {
String field = PersonService.HAS_APP_FILTER;
options.setFilter(field);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findAllConnectedPeople(ID_2,
appId)).andReturn(getDbPersonList());
expect(repository.findAllConnectedPeople(ID_3,
appId)).andReturn(getDbPersonList());
replay(repository);
@@ -395,6 +422,11 @@ public class PersonServiceTest {
options.setFilter(field);
options.setFilterValue(ID_1);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findFriendsWithFriend(ID_2,
ID_1)).andReturn(getDbPersonList());
expect(repository.findFriendsWithFriend(ID_3,
ID_1)).andReturn(getDbPersonList());
replay(repository);
@@ -417,6 +449,11 @@ public class PersonServiceTest {
options.setFilter(field);
options.setFilterValue(ID_1);
+ Long id2 = Long.parseLong(ID_2);
+ Long id3 = Long.parseLong(ID_3);
+ expect(repository.get(id2)).andReturn(getDbPerson(id2));
+ expect(repository.get(id3)).andReturn(getDbPerson(id3));
+
expect(repository.findAllConnectedPeopleWithFriend(ID_2,
ID_1)).andReturn(getDbPersonList());
expect(repository.findAllConnectedPeopleWithFriend(ID_3,
ID_1)).andReturn(getDbPersonList());
replay(repository);
@@ -477,6 +514,14 @@ public class PersonServiceTest {
return dbPerson;
}
+ private org.apache.rave.portal.model.Person getDbPerson(Long id) {
+ org.apache.rave.portal.model.Person dbPerson = new
org.apache.rave.portal.model.Person();
+ dbPerson.setEntityId(id);
+ dbPerson.setUsername(id.toString());
+ dbPerson.setDisplayName(DISPLAY_NAME);
+ return dbPerson;
+ }
+
private static boolean hasUniqueValues(Future<RestfulCollection<Person>>
people) throws ExecutionException, InterruptedException {
List<Person> persons = people.get().getEntry();
Set<String> idSet = new HashSet<String>();
