You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/01/24 01:13:41 UTC
svn commit: r737270 - in /ode/sandbox/simpel/src:
main/java/org/apache/ode/rest/ProcessWebResource.java
test/java/org/apache/ode/simpel/RestfulSimPELTest.java
Author: mriou
Date: Sat Jan 24 00:13:40 2009
New Revision: 737270
URL: http://svn.apache.org/viewvc?rev=737270&view=rev
Log:
Removed wrapping and unwrapping of requests.
Modified:
ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java
ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java
Modified: ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java?rev=737270&r1=737269&r2=737270&view=diff
==============================================================================
--- ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java (original)
+++ ode/sandbox/simpel/src/main/java/org/apache/ode/rest/ProcessWebResource.java Sat Jan 24 00:13:40 2009
@@ -38,8 +38,7 @@
return Response.status(204).build();
} else {
return Response.status(200)
- .entity(DOMUtils.domToString(DOMUtils.getFirstChildElement(DOMUtils
- .getFirstChildElement(mex.getResponse().getMessage()))))
+ .entity(unwrapResponse(mex.getResponse().getMessage()))
.type("application/xml")
.header("Location", _root+mex.getResource().getUrl())
.build();
@@ -85,8 +84,7 @@
b = Response.status(201).header("Location", _root + mex.getResource().getUrl());
else
b = Response.status(200);
- return b.entity(DOMUtils.domToString(DOMUtils.getFirstChildElement(DOMUtils
- .getFirstChildElement(mex.getResponse().getMessage()))))
+ return b.entity(unwrapResponse(mex.getResponse().getMessage()))
.type("application/xml")
.build();
}
@@ -94,6 +92,13 @@
else return Response.status(405).header("Allow", _resource.methods()).build();
}
+ private String unwrapResponse(Element resp) {
+ Element partElmt = DOMUtils.getFirstChildElement(DOMUtils.getFirstChildElement(resp));
+ Element unwrapped = DOMUtils.getFirstChildElement(partElmt);
+ if (unwrapped == null) return partElmt.getTextContent();
+ else return DOMUtils.domToString(unwrapped);
+ }
+
// This sucks big time
@GET @Produces("application/xml") @Path("{subpath}")
Modified: ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java
URL: http://svn.apache.org/viewvc/ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java?rev=737270&r1=737269&r2=737270&view=diff
==============================================================================
--- ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java (original)
+++ ode/sandbox/simpel/src/test/java/org/apache/ode/simpel/RestfulSimPELTest.java Sat Jan 24 00:13:40 2009
@@ -32,8 +32,7 @@
private static final String HELLO_WORLD =
"process HelloWorld { \n" +
" receive(self) { |name| \n" +
- " helloTmp = \"Hello \" + name; \n" +
- " helloXml = <hello>{helloTmp}</hello>; \n" +
+ " helloXml = <hello>{\"Hello \" + name}</hello>; \n" +
" reply(helloXml); \n" +
" }\n" +
"}";
@@ -49,7 +48,7 @@
WebResource wr = c.resource("http://localhost:3434/hello");
ClientResponse resp = wr.path("/").accept("application/xml").type("application/xml")
- .post(ClientResponse.class, "<simpelWrapper xmlns=\"http://ode.apache.org/simpel/1.0/definition/HelloWorld\">foo</simpelWrapper>");
+ .post(ClientResponse.class, "<wrapper>foo</wrapper>");
String response = resp.getEntity(String.class);
System.out.println("=> " + response);
assertTrue(response.indexOf("Hello foo") > 0);
@@ -61,6 +60,7 @@
"process Counter {\n" +
" counter = receive(self); \n" +
" reply(counter, self); \n" +
+
" value = resource(\"/value\"); \n" +
" inc = resource(\"/inc\"); \n" +
" dec = resource(\"/dec\"); \n" +
@@ -97,12 +97,12 @@
// Starting the counter process
WebResource wr = c.resource("http://localhost:3434/counter"); // TODO default on process name
ClientResponse createResponse = wr.path("/").accept("application/xml").type("application/xml")
- .post(ClientResponse.class, "<simpelWrapper xmlns=\"http://ode.apache.org/simpel/1.0/definition/Counter\">3</simpelWrapper>");
+ .post(ClientResponse.class, "<counter>3</counter>");
String response = createResponse.getEntity(String.class);
String location = createResponse.getMetadata().get("Location").get(0);
assertTrue(createResponse.getStatus() == 201);
assertTrue(location.matches(".*/counter/[0-9]*$"));
- assertTrue(response.indexOf("3") > 0);
+ assertEquals(response, "3");
// Requesting links
WebResource instance = c.resource(location);
@@ -119,7 +119,7 @@
ClientResponse valueResponse = instance.path("/value").type("application/xml").get(ClientResponse.class);
response = valueResponse.getEntity(String.class);
assertTrue(valueResponse.getStatus() == 200);
- assertTrue(response.indexOf("3") > 0);
+ assertTrue(response.indexOf("3") >= 0);
// Incrementing twice
ClientResponse incResponse;
@@ -128,14 +128,14 @@
response = incResponse.getEntity(String.class);
assertTrue(incResponse.getStatus() == 200);
System.out.println("=> " + response);
- assertTrue(response.indexOf(""+(4+n)) > 0);
+ assertTrue(response.indexOf(""+(4+n)) >= 0);
}
// Checking value again, should be 5 now
valueResponse = instance.path("/value").type("application/xml").get(ClientResponse.class);
response = valueResponse.getEntity(String.class);
assertTrue(valueResponse.getStatus() == 200);
- assertTrue(response.indexOf("5") > 0);
+ assertTrue(response.indexOf("5") >= 0);
// Decrementing counter to 0 to let process complete
ClientResponse decResponse;
@@ -143,7 +143,7 @@
decResponse = instance.path("/dec").type("application/xml").post(ClientResponse.class);
response = decResponse.getEntity(String.class);
assertTrue(valueResponse.getStatus() == 200);
- assertTrue(response.indexOf(""+(4-n)) > 0);
+ assertTrue(response.indexOf(""+(4-n)) >= 0);
}
// The process shouldn't be here anymore
@@ -173,10 +173,10 @@
WebResource wr = c.resource("http://localhost:3434/feedget");
ClientResponse resp = wr.path("/").accept("application/xml").type("application/xml")
- .post(ClientResponse.class, "<simpelWrapper xmlns=\"http://ode.apache.org/simpel/1.0/definition/CallingGet\">OffTheLip</simpelWrapper>");
+ .post(ClientResponse.class, "<name>OffTheLip</name>");
String response = resp.getEntity(String.class);
System.out.println("=> " + response);
- assertTrue(response.indexOf("Off The Lip") > 0);
+ assertEquals(response, "Off The Lip");
}
public static final String GET_PUT_POST_DELETE =
@@ -213,7 +213,7 @@
.post(ClientResponse.class, "<simpelWrapper xmlns=\"http://ode.apache.org/simpel/1.0/definition/AllMethods\">foo</simpelWrapper>");
String response = resp.getEntity(String.class);
System.out.println("=> " + response);
- assertTrue(response.indexOf("GETPOSTfooPUTbar") > 0);
+ assertEquals("GETPOSTfooPUTbar", response);
}
public static final String POST_WITH_201 =
@@ -243,10 +243,10 @@
WebResource wr = c.resource("http://localhost:3434/post201proc");
ClientResponse resp = wr.path("/").accept("application/xml").type("application/xml")
- .post(ClientResponse.class, "<simpelWrapper xmlns=\"http://ode.apache.org/simpel/1.0/definition/PostRedirect\">foo</simpelWrapper>");
+ .post(ClientResponse.class, "<foo>foo</foo>");
String response = resp.getEntity(String.class);
System.out.println("=> " + response);
- assertTrue(response.indexOf("http://foo/bar") > 0);
+ assertEquals(response, "http://foo/bar");
}
}