Author: doll
Date: Wed Jun 18 14:26:03 2008
New Revision: 669297
URL: http://svn.apache.org/viewvc?rev=669297&view=rev
Log:
SHINDIG-394
Patch from Dave Johnson. Changes the DataRequestHandler methods from package
protected to just protected to allow subclassing.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java?rev=669297&r1=669296&r2=669297&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/ActivityHandler.java
Wed Jun 18 14:26:03 2008
@@ -31,7 +31,7 @@
this.service = service;
}
- ResponseItem handleDelete(RequestItem request) {
+ protected ResponseItem handleDelete(RequestItem request) {
return new ResponseItem<Object>(ResponseError.BAD_REQUEST,
"You can't delete activities. ", null);
}
@@ -43,7 +43,7 @@
* /activities/john.doe/@self
* - postBody is an activity object
*/
- ResponseItem handlePut(RequestItem request) {
+ protected ResponseItem handlePut(RequestItem request) {
return handlePost(request);
}
@@ -54,7 +54,7 @@
* /activities/john.doe/@self
* - postBody is an activity object
*/
- ResponseItem handlePost(RequestItem request) {
+ protected ResponseItem handlePost(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
@@ -75,7 +75,7 @@
* /activities/john.doe/@self
* /activities/john.doe/@friends
*/
- ResponseItem handleGet(RequestItem request) {
+ protected ResponseItem handleGet(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java?rev=669297&r1=669296&r2=669297&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/AppDataHandler.java
Wed Jun 18 14:26:03 2008
@@ -47,7 +47,7 @@
* fields vars then all of the data will be overridden.
* @param request
*/
- ResponseItem handleDelete(RequestItem request) {
+ protected ResponseItem handleDelete(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
@@ -70,7 +70,7 @@
* be pulled from the values and set on the person object. If there are no
* fields vars then all of the data will be overridden.
*/
- ResponseItem handlePut(RequestItem request) {
+ protected ResponseItem handlePut(RequestItem request) {
return handlePost(request);
}
@@ -86,7 +86,7 @@
* be pulled from the values and set on the person object. If there are no
* fields vars then all of the data will be overridden.
*/
- ResponseItem handlePost(RequestItem request) {
+ protected ResponseItem handlePost(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
@@ -113,7 +113,7 @@
* /appdata/john.doe/@friends/app?fields=count
* /appdata/john.doe/@self/app
*/
- ResponseItem handleGet(RequestItem request) {
+ protected ResponseItem handleGet(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java?rev=669297&r1=669296&r2=669297&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/DataRequestHandler.java
Wed Jun 18 14:26:03 2008
@@ -55,13 +55,13 @@
return responseItem;
}
- abstract ResponseItem handleDelete(RequestItem request);
+ protected abstract ResponseItem handleDelete(RequestItem request);
- abstract ResponseItem handlePut(RequestItem request);
+ protected abstract ResponseItem handlePut(RequestItem request);
- abstract ResponseItem handlePost(RequestItem request);
+ protected abstract ResponseItem handlePost(RequestItem request);
- abstract ResponseItem handleGet(RequestItem request);
+ protected abstract ResponseItem handleGet(RequestItem request);
protected static String[] getParamsFromRequest(RequestItem request) {
return getQueryPath(request).split("/");
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java?rev=669297&r1=669296&r2=669297&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/dataservice/PersonHandler.java
Wed Jun 18 14:26:03 2008
@@ -36,16 +36,16 @@
this.personService = personService;
}
- ResponseItem handleDelete(RequestItem request) {
+ protected ResponseItem handleDelete(RequestItem request) {
return new ResponseItem<Object>(ResponseError.BAD_REQUEST,
"You can't delete people. ", null);
}
- ResponseItem handlePut(RequestItem request) {
+ protected ResponseItem handlePut(RequestItem request) {
return new ResponseItem<Object>(ResponseError.NOT_IMPLEMENTED,
"You can't add people right now. ", null); }
- ResponseItem handlePost(RequestItem request) {
+ protected ResponseItem handlePost(RequestItem request) {
return new ResponseItem<Object>(ResponseError.NOT_IMPLEMENTED,
"You can't add people right now. ", null);
}
@@ -58,7 +58,7 @@
* /people/john.doe/@friends
* /people/john.doe/@self
*/
- ResponseItem handleGet(RequestItem request) {
+ protected ResponseItem handleGet(RequestItem request) {
String[] segments = getParamsFromRequest(request);
UserId userId = UserId.fromJson(segments[0]);
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java?rev=669297&r1=669296&r2=669297&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/DataRequestHandlerTest.java
Wed Jun 18 14:26:03 2008
@@ -33,19 +33,19 @@
@Override
protected void setUp() throws Exception {
drh = new DataRequestHandler() {
- ResponseItem handleDelete(RequestItem request) {
+ protected ResponseItem handleDelete(RequestItem request) {
return new ResponseItem<String>("DELETE");
}
- ResponseItem handlePut(RequestItem request) {
+ protected ResponseItem handlePut(RequestItem request) {
return new ResponseItem<String>("PUT");
}
- ResponseItem handlePost(RequestItem request) {
+ protected ResponseItem handlePost(RequestItem request) {
return new ResponseItem<String>("POST");
}
- ResponseItem handleGet(RequestItem request) {
+ protected ResponseItem handleGet(RequestItem request) {
return new ResponseItem<String>("GET");
}
};
