Author: doll
Date: Mon Aug 25 08:30:36 2008
New Revision: 688758
URL: http://svn.apache.org/viewvc?rev=688758&view=rev
Log:
0.8.1 change
renamed orderBy to sortBy
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.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/RequestItem.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RpcRequestItemTest.java
Modified:
incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
(original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Mon
Aug 25 08:30:36 2008
@@ -227,7 +227,7 @@
rpc.params.count = opt_params['max'];
}
if (opt_params['sortOrder']) {
- rpc.params.orderBy = opt_params['sortOrder'];
+ rpc.params.sortBy = opt_params['sortOrder'];
}
if (opt_params['filter']) {
rpc.params.filterBy = opt_params['filter'];
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
Mon Aug 25 08:30:36 2008
@@ -126,7 +126,7 @@
return service.getActivities(userIds, request.getGroup(),
request.getAppId(),
// TODO: add pagination and sorting support
- // getOrderBy(params), getFilterBy(params), getStartIndex(params),
getCount(params),
+ // getSortBy(params), getFilterBy(params), getStartIndex(params),
getCount(params),
request.getFields(), request.getToken());
}
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=688758&r1=688757&r2=688758&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 25 08:30:36 2008
@@ -78,7 +78,7 @@
if (groupId.getType() == GroupId.Type.self) {
return personService.getPerson(userIds.iterator().next(), fields,
request.getToken());
} else {
- return personService.getPeople(userIds, groupId,
request.getOrderBy(),
+ return personService.getPeople(userIds, groupId, request.getSortBy(),
request.getFilterBy(), request.getStartIndex(),
request.getCount(),
fields, request.getToken());
}
@@ -94,13 +94,13 @@
}
// Every other case is a collection response of optional person ids
return personService.getPeople(personIds, new
GroupId(GroupId.Type.self, null),
- request.getOrderBy(), request.getFilterBy(),
request.getStartIndex(),
+ request.getSortBy(), request.getFilterBy(),
request.getStartIndex(),
request.getCount(), fields, request.getToken());
}
}
// Every other case is a collection response.
- return personService.getPeople(userIds, groupId, request.getOrderBy(),
+ return personService.getPeople(userIds, groupId, request.getSortBy(),
request.getFilterBy(), request.getStartIndex(), request.getCount(),
fields, request.getToken());
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
Mon Aug 25 08:30:36 2008
@@ -44,7 +44,7 @@
public static final String COUNT = "count";
- public static final String ORDER_BY = "orderBy";
+ public static final String SORT_BY = "sortBy";
public static final String FILTER_BY = "filterBy";
@@ -114,11 +114,11 @@
return count == null ? DEFAULT_COUNT : Integer.valueOf(count);
}
- public PersonService.SortOrder getOrderBy() {
- String orderBy = getParameter(ORDER_BY);
- return orderBy == null
+ public PersonService.SortOrder getSortBy() {
+ String sortBy = getParameter(SORT_BY);
+ return sortBy == null
? PersonService.SortOrder.topFriends
- : PersonService.SortOrder.valueOf(orderBy);
+ : PersonService.SortOrder.valueOf(sortBy);
}
public PersonService.FilterType getFilterBy() {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
Mon Aug 25 08:30:36 2008
@@ -446,7 +446,7 @@
@Test
public void testGetPeople() throws Exception {
Map<String, String> extraParams = Maps.newHashMap();
- extraParams.put("orderBy", "name");
+ extraParams.put("sortBy", "name");
extraParams.put("filterBy", null);
extraParams.put("startIndex", null);
extraParams.put("count", "20");
@@ -469,7 +469,7 @@
@Test
public void testGetPeoplePagination() throws Exception {
Map<String, String> extraParams = Maps.newHashMap();
- extraParams.put("orderBy", "name");
+ extraParams.put("sortBy", "name");
extraParams.put("filterBy", null);
extraParams.put("startIndex", "0");
extraParams.put("count", "1");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Mon Aug 25 08:30:36 2008
@@ -72,7 +72,7 @@
private void setPath(String path) {
Map<String, String> params = Maps.newHashMap();
- params.put("orderBy", null);
+ params.put("sortBy", null);
params.put("filterBy", null);
params.put("startIndex", null);
params.put("count", null);
@@ -130,7 +130,7 @@
PersonService.FilterType filter = PersonService.FilterType.topFriends;
Map<String, String> params = Maps.newHashMap();
- params.put("orderBy", order.toString());
+ params.put("sortBy", order.toString());
params.put("filterBy", filter.toString());
params.put("startIndex", "5");
params.put("count", "10");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Mon Aug 25 08:30:36 2008
@@ -103,12 +103,12 @@
assertEquals(5, request.getCount());
}
- public void testOrderBy() throws Exception {
- request.setParameter("orderBy", null);
- assertEquals(PersonService.SortOrder.topFriends, request.getOrderBy());
+ public void testSortBy() throws Exception {
+ request.setParameter("sortBy", null);
+ assertEquals(PersonService.SortOrder.topFriends, request.getSortBy());
- request.setParameter("orderBy", "name");
- assertEquals(PersonService.SortOrder.name, request.getOrderBy());
+ request.setParameter("sortBy", "name");
+ assertEquals(PersonService.SortOrder.name, request.getSortBy());
}
public void testFilterBy() throws Exception {
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RpcRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RpcRequestItemTest.java?rev=688758&r1=688757&r2=688758&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RpcRequestItemTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RpcRequestItemTest.java
Mon Aug 25 08:30:36 2008
@@ -98,12 +98,12 @@
assertEquals(5, request.getCount());
}
- public void testOrderBy() throws Exception {
- request.setParameter("orderBy", null);
- assertEquals(PersonService.SortOrder.topFriends, request.getOrderBy());
+ public void testSortBy() throws Exception {
+ request.setParameter("sortBy", null);
+ assertEquals(PersonService.SortOrder.topFriends, request.getSortBy());
- request.setParameter("orderBy", "name");
- assertEquals(PersonService.SortOrder.name, request.getOrderBy());
+ request.setParameter("sortBy", "name");
+ assertEquals(PersonService.SortOrder.name, request.getSortBy());
}
public void testFilterBy() throws Exception {
