mirror of https://github.com/apache/jclouds.git
Issue 62: always set Content-Length
git-svn-id: http://jclouds.googlecode.com/svn/trunk@1424 3d8758e0-26b5-11de-8745-db77d3ebf521
This commit is contained in:
parent
cd1c3ae900
commit
e773803ee2
|
@ -34,6 +34,7 @@ import java.net.MalformedURLException;
|
|||
import java.net.URL;
|
||||
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.jclouds.http.HttpConstants;
|
||||
import org.jclouds.http.HttpFutureCommand;
|
||||
import org.jclouds.http.HttpFutureCommandClient;
|
||||
import org.jclouds.http.HttpRequest;
|
||||
|
@ -49,101 +50,95 @@ import com.google.inject.Inject;
|
|||
*/
|
||||
public class JavaUrlHttpFutureCommandClient extends BaseHttpFutureCommandClient {
|
||||
|
||||
@Inject
|
||||
public JavaUrlHttpFutureCommandClient(URL target)
|
||||
throws MalformedURLException {
|
||||
super(target);
|
||||
}
|
||||
@Inject
|
||||
public JavaUrlHttpFutureCommandClient(URL target) throws MalformedURLException {
|
||||
super(target);
|
||||
}
|
||||
|
||||
public void submit(HttpFutureCommand<?> command) {
|
||||
HttpRequest request = command.getRequest();
|
||||
HttpURLConnection connection = null;
|
||||
try {
|
||||
HttpResponse response = null;
|
||||
for (;;) {
|
||||
for (HttpRequestFilter filter : requestFilters) {
|
||||
filter.filter(request);
|
||||
}
|
||||
logger.trace("%1$s - converting request %2$s", target, request);
|
||||
connection = openJavaConnection(request);
|
||||
logger
|
||||
.trace("%1$s - submitting request %2$s", target,
|
||||
connection);
|
||||
response = getResponse(connection);
|
||||
logger.trace("%1$s - received response %2$s", target, response);
|
||||
if (response.getStatusCode() >= 500 && httpRetryHandler.retryRequest(command, response))
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
handleResponse(command, response);
|
||||
} catch (Exception e) {
|
||||
command.setException(e);
|
||||
} finally {
|
||||
// DO NOT disconnect, as it will also close the unconsumed
|
||||
// outputStream from above.
|
||||
if (request.getMethod().equals("HEAD"))
|
||||
connection.disconnect();
|
||||
}
|
||||
}
|
||||
public void submit(HttpFutureCommand<?> command) {
|
||||
HttpRequest request = command.getRequest();
|
||||
HttpURLConnection connection = null;
|
||||
try {
|
||||
HttpResponse response = null;
|
||||
for (;;) {
|
||||
for (HttpRequestFilter filter : requestFilters) {
|
||||
filter.filter(request);
|
||||
}
|
||||
logger.trace("%1$s - converting request %2$s", target, request);
|
||||
connection = openJavaConnection(request);
|
||||
logger.trace("%1$s - submitting request %2$s", target, connection);
|
||||
response = getResponse(connection);
|
||||
logger.trace("%1$s - received response %2$s", target, response);
|
||||
if (response.getStatusCode() >= 500 && httpRetryHandler.retryRequest(command, response))
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
handleResponse(command, response);
|
||||
} catch (Exception e) {
|
||||
command.setException(e);
|
||||
} finally {
|
||||
// DO NOT disconnect, as it will also close the unconsumed
|
||||
// outputStream from above.
|
||||
if (request.getMethod().equals("HEAD"))
|
||||
connection.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
protected HttpResponse getResponse(HttpURLConnection connection)
|
||||
throws IOException {
|
||||
HttpResponse response = new HttpResponse();
|
||||
InputStream in;
|
||||
try {
|
||||
in = connection.getInputStream();
|
||||
} catch (IOException e) {
|
||||
in = connection.getErrorStream();
|
||||
}
|
||||
if (in != null) {
|
||||
response.setContent(in);
|
||||
}
|
||||
response.setStatusCode(connection.getResponseCode());
|
||||
for (String header : connection.getHeaderFields().keySet()) {
|
||||
response.getHeaders().putAll(header,
|
||||
connection.getHeaderFields().get(header));
|
||||
}
|
||||
protected HttpResponse getResponse(HttpURLConnection connection) throws IOException {
|
||||
HttpResponse response = new HttpResponse();
|
||||
InputStream in;
|
||||
try {
|
||||
in = connection.getInputStream();
|
||||
} catch (IOException e) {
|
||||
in = connection.getErrorStream();
|
||||
}
|
||||
if (in != null) {
|
||||
response.setContent(in);
|
||||
}
|
||||
response.setStatusCode(connection.getResponseCode());
|
||||
for (String header : connection.getHeaderFields().keySet()) {
|
||||
response.getHeaders().putAll(header, connection.getHeaderFields().get(header));
|
||||
}
|
||||
|
||||
response.setMessage(connection.getResponseMessage());
|
||||
return response;
|
||||
}
|
||||
response.setMessage(connection.getResponseMessage());
|
||||
return response;
|
||||
}
|
||||
|
||||
protected HttpURLConnection openJavaConnection(HttpRequest request)
|
||||
throws IOException {
|
||||
URL url = new URL(target, request.getUri());
|
||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||
connection.setDoOutput(true);
|
||||
connection.setAllowUserInteraction(false);
|
||||
connection.setInstanceFollowRedirects(true);
|
||||
connection.setRequestMethod(request.getMethod());
|
||||
for (String header : request.getHeaders().keySet()) {
|
||||
for (String value : request.getHeaders().get(header))
|
||||
connection.setRequestProperty(header, value);
|
||||
}
|
||||
if (request.getPayload() != null) {
|
||||
OutputStream out = connection.getOutputStream();
|
||||
try {
|
||||
if (request.getPayload() instanceof String) {
|
||||
OutputStreamWriter writer = new OutputStreamWriter(out);
|
||||
writer.write((String) request.getPayload());
|
||||
writer.close();
|
||||
} else if (request.getPayload() instanceof InputStream) {
|
||||
IOUtils.copy((InputStream) request.getPayload(), out);
|
||||
} else if (request.getPayload() instanceof File) {
|
||||
IOUtils.copy(new FileInputStream((File) request
|
||||
.getPayload()), out);
|
||||
} else if (request.getPayload() instanceof byte[]) {
|
||||
IOUtils.write((byte[]) request.getPayload(), out);
|
||||
} else {
|
||||
throw new UnsupportedOperationException(
|
||||
"Content not supported "
|
||||
+ request.getPayload().getClass());
|
||||
}
|
||||
} finally {
|
||||
IOUtils.closeQuietly(out);
|
||||
}
|
||||
protected HttpURLConnection openJavaConnection(HttpRequest request) throws IOException {
|
||||
URL url = new URL(target, request.getUri());
|
||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||
connection.setDoOutput(true);
|
||||
connection.setAllowUserInteraction(false);
|
||||
connection.setInstanceFollowRedirects(true);
|
||||
connection.setRequestMethod(request.getMethod());
|
||||
for (String header : request.getHeaders().keySet()) {
|
||||
for (String value : request.getHeaders().get(header))
|
||||
connection.setRequestProperty(header, value);
|
||||
}
|
||||
if (request.getPayload() != null) {
|
||||
OutputStream out = connection.getOutputStream();
|
||||
try {
|
||||
if (request.getPayload() instanceof String) {
|
||||
OutputStreamWriter writer = new OutputStreamWriter(out);
|
||||
writer.write((String) request.getPayload());
|
||||
writer.close();
|
||||
} else if (request.getPayload() instanceof InputStream) {
|
||||
IOUtils.copy((InputStream) request.getPayload(), out);
|
||||
} else if (request.getPayload() instanceof File) {
|
||||
IOUtils.copy(new FileInputStream((File) request.getPayload()), out);
|
||||
} else if (request.getPayload() instanceof byte[]) {
|
||||
IOUtils.write((byte[]) request.getPayload(), out);
|
||||
} else {
|
||||
throw new UnsupportedOperationException("Content not supported "
|
||||
+ request.getPayload().getClass());
|
||||
}
|
||||
} finally {
|
||||
IOUtils.closeQuietly(out);
|
||||
}
|
||||
|
||||
}
|
||||
return connection;
|
||||
}
|
||||
} else {
|
||||
connection.setRequestProperty(HttpConstants.CONTENT_LENGTH, "0");
|
||||
}
|
||||
return connection;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -55,101 +55,108 @@ import com.google.inject.TypeLiteral;
|
|||
import com.google.inject.name.Names;
|
||||
|
||||
public abstract class BaseJettyTest {
|
||||
protected static final String XML = "<foo><bar>whoppers</bar></foo>";
|
||||
protected Server server = null;
|
||||
protected CommandFactory factory;
|
||||
protected HttpFutureCommandClient client;
|
||||
protected Injector injector;
|
||||
private Closer closer;
|
||||
private AtomicInteger cycle = new AtomicInteger(0);
|
||||
protected static final String XML = "<foo><bar>whoppers</bar></foo>";
|
||||
protected Server server = null;
|
||||
protected CommandFactory factory;
|
||||
protected HttpFutureCommandClient client;
|
||||
protected Injector injector;
|
||||
private Closer closer;
|
||||
private AtomicInteger cycle = new AtomicInteger(0);
|
||||
|
||||
@BeforeTest
|
||||
@Parameters( { "test-jetty-port" })
|
||||
public void setUpJetty(@Optional("8123") final int testPort)
|
||||
throws Exception {
|
||||
Handler handler = new AbstractHandler() {
|
||||
@BeforeTest
|
||||
@Parameters( { "test-jetty-port" })
|
||||
public void setUpJetty(@Optional("8123") final int testPort) throws Exception {
|
||||
Handler handler = new AbstractHandler() {
|
||||
|
||||
public void handle(String target, HttpServletRequest request,
|
||||
HttpServletResponse response, int dispatch)
|
||||
throws IOException, ServletException {
|
||||
if (request.getHeader("test") != null) {
|
||||
response.setContentType("text/plain");
|
||||
response.setStatus(HttpServletResponse.SC_OK);
|
||||
response.getWriter().println("test");
|
||||
} else {
|
||||
if (failOnRequest(request, response))
|
||||
return;
|
||||
response.setContentType("text/xml");
|
||||
response.setStatus(HttpServletResponse.SC_OK);
|
||||
response.getWriter().println(XML);
|
||||
}
|
||||
((Request) request).setHandled(true);
|
||||
}
|
||||
};
|
||||
public void handle(String target, HttpServletRequest request,
|
||||
HttpServletResponse response, int dispatch) throws IOException, ServletException {
|
||||
failIfNoContentLength(request, response);
|
||||
if (request.getHeader("test") != null) {
|
||||
response.setContentType("text/plain");
|
||||
response.setStatus(HttpServletResponse.SC_OK);
|
||||
response.getWriter().println("test");
|
||||
} else {
|
||||
if (failOnRequest(request, response))
|
||||
return;
|
||||
response.setContentType("text/xml");
|
||||
response.setStatus(HttpServletResponse.SC_OK);
|
||||
response.getWriter().println(XML);
|
||||
}
|
||||
((Request) request).setHandled(true);
|
||||
}
|
||||
};
|
||||
|
||||
server = new Server(testPort);
|
||||
server.setHandler(handler);
|
||||
server.start();
|
||||
final Properties properties = new Properties();
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_ADDRESS, "localhost");
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_PORT, testPort + "");
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_SECURE, "false");
|
||||
addConnectionProperties(properties);
|
||||
final List<HttpRequestFilter> filters = new ArrayList<HttpRequestFilter>(
|
||||
1);
|
||||
filters.add(new HttpRequestFilter() {
|
||||
public void filter(HttpRequest request) throws HttpException {
|
||||
if (request.getHeaders().containsKey("filterme")) {
|
||||
request.getHeaders().put("test", "test");
|
||||
}
|
||||
}
|
||||
});
|
||||
injector = Guice.createInjector(new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
Names.bindProperties(binder(), properties);
|
||||
}
|
||||
}, new JDKLoggingModule(), new HttpCommandsModule(),
|
||||
createClientModule(), new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(new TypeLiteral<List<HttpRequestFilter>>() {
|
||||
}).toInstance(filters);
|
||||
}
|
||||
});
|
||||
factory = injector.getInstance(Key.get(CommandFactory.class));
|
||||
client = injector.getInstance(HttpFutureCommandClient.class);
|
||||
closer = injector.getInstance(Closer.class);
|
||||
assert client != null;
|
||||
}
|
||||
|
||||
@AfterTest
|
||||
public void tearDownJetty() throws Exception {
|
||||
closer.close();
|
||||
server.stop();
|
||||
}
|
||||
|
||||
server = new Server(testPort);
|
||||
server.setHandler(handler);
|
||||
server.start();
|
||||
final Properties properties = new Properties();
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_ADDRESS, "localhost");
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_PORT, testPort + "");
|
||||
properties.put(HttpConstants.PROPERTY_HTTP_SECURE, "false");
|
||||
addConnectionProperties(properties);
|
||||
final List<HttpRequestFilter> filters = new ArrayList<HttpRequestFilter>(1);
|
||||
filters.add(new HttpRequestFilter() {
|
||||
public void filter(HttpRequest request) throws HttpException {
|
||||
if (request.getHeaders().containsKey("filterme")) {
|
||||
request.getHeaders().put("test", "test");
|
||||
}
|
||||
}
|
||||
});
|
||||
injector = Guice.createInjector(new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
Names.bindProperties(binder(), properties);
|
||||
}
|
||||
}, new JDKLoggingModule(), new HttpCommandsModule(), createClientModule(),
|
||||
new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(new TypeLiteral<List<HttpRequestFilter>>() {
|
||||
}).toInstance(filters);
|
||||
}
|
||||
});
|
||||
factory = injector.getInstance(Key.get(CommandFactory.class));
|
||||
client = injector.getInstance(HttpFutureCommandClient.class);
|
||||
closer = injector.getInstance(Closer.class);
|
||||
assert client != null;
|
||||
}
|
||||
|
||||
protected abstract void addConnectionProperties(Properties props);
|
||||
@AfterTest
|
||||
public void tearDownJetty() throws Exception {
|
||||
closer.close();
|
||||
server.stop();
|
||||
}
|
||||
|
||||
protected abstract void addConnectionProperties(Properties props);
|
||||
|
||||
protected abstract Module createClientModule();
|
||||
|
||||
/**
|
||||
* Fails every 10 requests.
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
protected boolean failOnRequest(HttpServletRequest request, HttpServletResponse response)
|
||||
throws IOException {
|
||||
if (cycle.incrementAndGet() % 10 == 0) {
|
||||
response.sendError(500);
|
||||
((Request) request).setHandled(true);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected boolean failIfNoContentLength(HttpServletRequest request, HttpServletResponse response)
|
||||
throws IOException {
|
||||
if (request.getHeader(HttpConstants.CONTENT_LENGTH) == null) {
|
||||
response.sendError(500);
|
||||
((Request) request).setHandled(true);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected abstract Module createClientModule();
|
||||
|
||||
/**
|
||||
* Fails every 10 requests.
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
* @throws IOException
|
||||
*/
|
||||
protected boolean failOnRequest(HttpServletRequest request,
|
||||
HttpServletResponse response) throws IOException {
|
||||
if (cycle.incrementAndGet() % 10 == 0) {
|
||||
response.sendError(500);
|
||||
((Request) request).setHandled(true);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -179,6 +179,8 @@ public class URLFetchServiceClient extends BaseHttpFutureCommandClient {
|
|||
if (request.getPayload() != null) {
|
||||
changeRequestContentToBytes(request);
|
||||
gaeRequest.setPayload((byte[]) request.getPayload());
|
||||
} else {
|
||||
gaeRequest.addHeader(new HTTPHeader(HttpConstants.CONTENT_LENGTH, "0"));
|
||||
}
|
||||
return gaeRequest;
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ public class URLFetchServiceClientTest {
|
|||
HttpRequest request = new HttpRequest("GET", "foo");
|
||||
HTTPRequest gaeRequest = client.convert(request);
|
||||
assert gaeRequest.getPayload() == null;
|
||||
assertEquals(gaeRequest.getHeaders().size(), 0);
|
||||
assertEquals(gaeRequest.getHeaders().size(), 1);//content length
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue