Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPR-5836 - RestTemplate - postForObject() method

Browse Source
This commit is contained in:
Arjen Poutsma
2009-06-19 07:50:06 +00:00
parent 4ea373b7dd
commit ddcd9f4905
4 changed files with 252 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
View File

@@ -42,24 +42,26 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.client.CommonsClientHttpRequestFactory;
import org.springframework.util.FileCopyUtils;
/**
* @author Arjen Poutsma
*/
/** @author Arjen Poutsma */
public class RestTemplateIntegrationTests {
private RestTemplate template;
private static Server jettyServer;
private static String helloWorld = "H\u00e9llo W\u00f6rld";
@BeforeClass
public static void startJettyServer() throws Exception {
jettyServer = new Server(8889);
Context jettyContext = new Context(jettyServer, "/");
String s = "H\u00e9llo W\u00f6rld";
byte[] bytes = s.getBytes("UTF-8");
jettyContext.addServlet(new ServletHolder(new GetServlet(bytes, "text/plain;charset=utf-8")), "/get");
jettyContext
.addServlet(new ServletHolder(new PostServlet(s, new URI("http://localhost:8889/post/1"))), "/post");
byte[] bytes = helloWorld.getBytes("UTF-8");
String contentType = "text/plain;charset=utf-8";
jettyContext.addServlet(new ServletHolder(new GetServlet(bytes, contentType)), "/get");
jettyContext.addServlet(new ServletHolder(new GetServlet(new byte[0], contentType)), "/get/nothing");
jettyContext.addServlet(
new ServletHolder(new PostServlet(helloWorld, "http://localhost:8889/post/1", bytes, contentType)),
"/post");
jettyContext.addServlet(new ServletHolder(new ErrorServlet(404)), "/errors/notfound");
jettyContext.addServlet(new ServletHolder(new ErrorServlet(500)), "/errors/server");
jettyServer.start();
@@ -67,7 +69,6 @@ public class RestTemplateIntegrationTests {
@Before
public void createTemplate() {
// template = new RestTemplate();
template = new RestTemplate(new CommonsClientHttpRequestFactory());
}
@@ -81,15 +82,27 @@ public class RestTemplateIntegrationTests {
@Test
public void getString() {
String s = template.getForObject("http://localhost:8889/{method}", String.class, "get");
assertEquals("Invalid content", "H\u00e9llo W\u00f6rld", s);
assertEquals("Invalid content", helloWorld, s);
}
@Test
public void postString() throws URISyntaxException {
URI location = template.postForLocation("http://localhost:8889/{method}", "H\u00e9llo W\u00f6rld", "post");
public void getNoResponse() {
String s = template.getForObject("http://localhost:8889/get/nothing", String.class);
assertEquals("Invalid content", "", s);
}
@Test
public void postForLocation() throws URISyntaxException {
URI location = template.postForLocation("http://localhost:8889/{method}", helloWorld, "post");
assertEquals("Invalid location", new URI("http://localhost:8889/post/1"), location);
}
@Test
public void postForObject() throws URISyntaxException {
String s = template.postForObject("http://localhost:8889/{method}", helloWorld, String.class, "post");
assertEquals("Invalid content", helloWorld, s);
}
@Test(expected = HttpClientErrorException.class)
public void notFound() {
template.execute("http://localhost:8889/errors/notfound", HttpMethod.GET, null, null);
@@ -107,10 +120,7 @@ public class RestTemplateIntegrationTests {
EnumSet.of(HttpMethod.GET, HttpMethod.OPTIONS, HttpMethod.HEAD, HttpMethod.TRACE), allowed);
}
/**
* Servlet that returns and error message for a given status code.
*/
/** Servlet that returns and error message for a given status code. */
private static class ErrorServlet extends GenericServlet {
private final int sc;
@@ -125,7 +135,6 @@ public class RestTemplateIntegrationTests {
}
}
private static class GetServlet extends HttpServlet {
private final byte[] buf;
@@ -140,22 +149,27 @@ public class RestTemplateIntegrationTests {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
response.setContentLength(buf.length);
response.setContentType(contentType);
response.setContentLength(buf.length);
FileCopyUtils.copy(buf, response.getOutputStream());
}
}
private static class PostServlet extends HttpServlet {
private final String s;
private final URI location;
private final String location;
private PostServlet(String s, URI location) {
private final byte[] buf;
private final String contentType;
private PostServlet(String s, String location, byte[] buf, String contentType) {
this.s = s;
this.location = location;
this.buf = buf;
this.contentType = contentType;
}
@Override
@@ -166,7 +180,10 @@ public class RestTemplateIntegrationTests {
String body = FileCopyUtils.copyToString(request.getReader());
assertEquals("Invalid request body", s, body);
response.setStatus(HttpServletResponse.SC_CREATED);
response.setHeader("Location", location.toASCIIString());
response.setHeader("Location", location);
response.setContentLength(buf.length);
response.setContentType(contentType);
FileCopyUtils.copy(buf, response.getOutputStream());
}
}

58
org.springframework.web/src/test/java/org/springframework/web/client/RestTemplateTests.java
View File

@@ -40,9 +40,7 @@ import org.springframework.http.converter.ByteArrayHttpMessageConverter;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
/**
* @author Arjen Poutsma
*/
/** @author Arjen Poutsma */
@SuppressWarnings("unchecked")
public class RestTemplateTests {
@@ -265,7 +263,7 @@ public class RestTemplateTests {
}
@Test
public void postNull() throws Exception {
public void postForLocationNull() throws Exception {
expect(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).andReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
expect(request.getHeaders()).andReturn(requestHeaders);
@@ -282,6 +280,58 @@ public class RestTemplateTests {
verifyMocks();
}
@Test
public void postForObject() throws Exception {
expect(converter.supports(String.class)).andReturn(true).times(2);
expect(converter.supports(Integer.class)).andReturn(true).times(2);
MediaType textPlain = new MediaType("text", "plain");
expect(converter.getSupportedMediaTypes()).andReturn(Collections.singletonList(textPlain)).times(2);
expect(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).andReturn(this.request);
HttpHeaders requestHeaders = new HttpHeaders();
expect(this.request.getHeaders()).andReturn(requestHeaders);
String request = "Hello World";
converter.write(request, this.request);
expect(this.request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(textPlain);
expect(response.getHeaders()).andReturn(responseHeaders);
Integer expected = 42;
expect(converter.read(Integer.class, response)).andReturn(expected);
response.close();
replayMocks();
Integer result = template.postForObject("http://example.com", request, Integer.class);
assertEquals("Invalid POST result", expected, result);
assertEquals("Invalid Accept header", textPlain.toString(), requestHeaders.getFirst("Accept"));
verifyMocks();
}
@Test
public void postForObjectNull() throws Exception {
expect(converter.supports(Integer.class)).andReturn(true).times(2);
MediaType textPlain = new MediaType("text", "plain");
expect(converter.getSupportedMediaTypes()).andReturn(Collections.singletonList(textPlain)).times(2);
expect(requestFactory.createRequest(new URI("http://example.com"), HttpMethod.POST)).andReturn(request);
HttpHeaders requestHeaders = new HttpHeaders();
expect(request.getHeaders()).andReturn(requestHeaders).times(2);
expect(request.execute()).andReturn(response);
expect(errorHandler.hasError(response)).andReturn(false);
HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(textPlain);
expect(response.getHeaders()).andReturn(responseHeaders);
expect(converter.read(Integer.class, response)).andReturn(null);
response.close();
replayMocks();
template.postForObject("http://example.com", null, Integer.class);
assertEquals("Invalid content length", 0, requestHeaders.getContentLength());
verifyMocks();
}
@Test
public void put() throws Exception {
expect(converter.supports(String.class)).andReturn(true).times(2);