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

fixed issue with reading response HTTP headers

Browse Source
This commit is contained in:
Arjen Poutsma
2007-02-17 13:17:45 +00:00
parent 05cc2a1e81
commit a6b8977e86
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/springframework/ws/transport/http/CommonsHttpTransportInputStream.java
View File

@@ -60,7 +60,7 @@ public class CommonsHttpTransportInputStream extends TransportInputStream {
}
public Iterator getHeaders(String name) throws IOException {
Header[] headers = postMethod.getRequestHeaders(name);
Header[] headers = postMethod.getResponseHeaders(name);
String[] names = new String[headers.length];
for (int i = 0; i < headers.length; i++) {
names[i] = headers[i].getValue();

2
core/src/main/java/org/springframework/ws/transport/http/HttpUrlConnectionTransportInputStream.java
View File

@@ -69,7 +69,7 @@ public class HttpUrlConnectionTransportInputStream extends TransportInputStream
// Header field 0 is the status line, so we start at 1
int i = 1;
while (true) {
String headerName = connection.getHeaderField(i);
String headerName = connection.getHeaderFieldKey(i);
if (!StringUtils.hasLength(headerName)) {
break;
}

25
core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderTestCase.java
View File

@@ -50,9 +50,13 @@ public abstract class AbstractHttpWebServiceMessageSenderTestCase extends XMLTes
protected Server jettyServer;
protected static final String HEADER_NAME = "SOAPAction";
private static final String REQUEST_HEADER_NAME = "RequestHeader";
protected static final String HEADER_VALUE = "http://springframework.org/spring-ws";
private static final String REQUEST_HEADER_VALUE = "RequestHeaderValue";
private static final String RESPONSE_HEADER_NAME = "ResponseHeader";
private static final String RESPONSE_HEADER_VALUE = "ResponseHeaderValue";
protected static final String URL = "http://localhost:8888";
@@ -95,16 +99,22 @@ public abstract class AbstractHttpWebServiceMessageSenderTestCase extends XMLTes
public void testSendAndReceiveResponse() throws Exception {
messageSender.setUrl(new URL("http://localhost:8888/response"));
SOAPMessage saajRequest = messageFactory.createMessage();
saajRequest.getMimeHeaders().addHeader(HEADER_NAME, HEADER_VALUE);
saajRequest.getMimeHeaders().addHeader(REQUEST_HEADER_NAME, REQUEST_HEADER_VALUE);
transformer.transform(new StringSource(REQUEST), new DOMResult(saajRequest.getSOAPBody()));
SaajSoapMessage request = new SaajSoapMessage(saajRequest);
MessageContext context = new DefaultMessageContext(request, new SaajSoapMessageFactory(messageFactory));
messageSender.sendAndReceive(context);
assertXMLEqual(EXPECTED_SOAP_REQUEST, receivedRequest.toString());
assertEquals("Invalid header value received", HEADER_VALUE, receivedHeader);
assertEquals("Invalid header value received on server side", REQUEST_HEADER_VALUE, receivedHeader);
assertTrue("No response", context.hasResponse());
SaajSoapMessage response = (SaajSoapMessage) context.getResponse();
SOAPMessage saajResponse = response.getSaajMessage();
assertNotNull("No header value received on client side",
saajResponse.getMimeHeaders().getHeader(RESPONSE_HEADER_NAME));
assertEquals("Invalid header value received on client side", RESPONSE_HEADER_VALUE,
saajResponse.getMimeHeaders().getHeader(RESPONSE_HEADER_NAME)[0]);
ByteArrayOutputStream os = new ByteArrayOutputStream();
context.getResponse().writeTo(os);
response.writeTo(os);
assertXMLEqual(RESPONSE, os.toString("UTF-8"));
}
@@ -125,11 +135,12 @@ public abstract class AbstractHttpWebServiceMessageSenderTestCase extends XMLTes
StringResult requestResult = new StringResult();
transformer.transform(new StreamSource(req.getInputStream()), requestResult);
receivedRequest = requestResult.toString();
receivedHeader = ((HttpServletRequest) req).getHeader(HEADER_NAME);
receivedHeader = ((HttpServletRequest) req).getHeader(REQUEST_HEADER_NAME);
HttpServletResponse httpServletResponse = (HttpServletResponse) res;
httpServletResponse.setStatus(HttpServletResponse.SC_OK);
httpServletResponse.addHeader("Content-Type", "text/xml");
httpServletResponse.addHeader(RESPONSE_HEADER_NAME, RESPONSE_HEADER_VALUE);
FileCopyUtils.copy(RESPONSE.getBytes("UTF-8"), res.getOutputStream());
}
catch (TransformerException ex) {
@@ -145,7 +156,7 @@ public abstract class AbstractHttpWebServiceMessageSenderTestCase extends XMLTes
StringResult requestResult = new StringResult();
transformer.transform(new StreamSource(req.getInputStream()), requestResult);
receivedRequest = requestResult.toString();
receivedHeader = ((HttpServletRequest) req).getHeader(HEADER_NAME);
receivedHeader = ((HttpServletRequest) req).getHeader(REQUEST_HEADER_NAME);
HttpServletResponse httpServletResponse = (HttpServletResponse) res;
httpServletResponse.setStatus(HttpServletResponse.SC_NO_CONTENT);