Author: rfeng
Date: Sat Jun 26 00:02:37 2010
New Revision: 958151
URL: http://svn.apache.org/viewvc?rev=958151&view=rev
Log:
Use Response as the type
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java?rev=958151&r1=958150&r2=958151&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
Sat Jun 26 00:02:37 2010
@@ -29,7 +29,6 @@ import org.apache.tuscany.sca.node.NodeF
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import com.meterware.httpunit.GetMethodWebRequest;
@@ -72,7 +71,6 @@ public class CustomerServiceTestCase {
}
@Test
- @Ignore
public void testGetInvocation() throws Exception {
WebConversation wc = new WebConversation();
WebRequest request = new GetMethodWebRequest(SERVICE_URL);
@@ -90,22 +88,21 @@ public class CustomerServiceTestCase {
//System.out.println(">>>" + response.getText());
Assert.assertEquals(200, response.getResponseCode());
- Assert.assertEquals("no-cache",
response.getHeaderField("Cache-Control"));
- Assert.assertEquals("tuscany", response.getHeaderField("X-Tuscany"));
+// Assert.assertEquals("no-cache",
response.getHeaderField("Cache-Control"));
+// Assert.assertEquals("tuscany", response.getHeaderField("X-Tuscany"));
Assert.assertEquals(GET_RESPONSE, response.getText());
}
-
@Test
public void testPutInvocation() throws Exception {
//Add new item to catalog
WebConversation wc = new WebConversation();
- WebRequest request = new PostMethodWebRequest(SERVICE_URL, new
ByteArrayInputStream(UPDATED_ITEM.getBytes("UTF-8")),"application/json");
- request.setHeaderField("Content-Type", "application/xml");
+ WebRequest request = new PostMethodWebRequest(SERVICE_URL, new
ByteArrayInputStream(UPDATED_ITEM.getBytes("UTF-8")),"application/xml");
WebResponse response = wc.getResource(request);
- Assert.assertEquals(204, response.getResponseCode());
+ Assert.assertEquals(201, response.getResponseCode());
+ System.out.println(response.getHeaderField("Location"));
//read new results and expect to get new item back in the response
request = new GetMethodWebRequest(SERVICE_URL);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java?rev=958151&r1=958150&r2=958151&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
Sat Jun 26 00:02:37 2010
@@ -23,6 +23,7 @@ import javax.jws.WebResult;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
+import javax.ws.rs.core.Response;
import org.oasisopen.sca.annotation.Remotable;
@@ -33,8 +34,12 @@ public interface CustomerService {
@WebResult(name = "Customer", targetNamespace = "")
Customer get();
+ @GET
+ @WebResult(name = "Customer", targetNamespace = "")
+ Response getResponse();
+
@POST
- void addCustomer(Customer customer);
+ Response addCustomer(Customer customer);
@PUT
void updateCustomer(Customer customer);
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java?rev=958151&r1=958150&r2=958151&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
Sat Jun 26 00:02:37 2010
@@ -19,9 +19,12 @@
package services.customer;
+import java.net.URI;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.core.Response;
+
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Scope;
@@ -38,8 +41,13 @@ public class CustomerServiceImpl impleme
return customers.values().iterator().next();
}
- public void addCustomer(Customer customer) {
+ public Response getResponse() {
+ return Response.ok(get()).build();
+ }
+
+ public Response addCustomer(Customer customer) {
customers.put(customer.getName(), customer);
+ return Response.created(URI.create("/001")).build();
}
public void updateCustomer(Customer customer) {
