android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-27 18:21:14 +03:00
Code Releases Activity

Never convert null into an empty request body.

Browse Source 
This is a behavior change.
This commit is contained in:
jwilson
2015-04-15 15:49:36 -04:00
parent 4412838406
commit 1abba290f5
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
okcurl/src/test/java/com/squareup/okhttp/curl/MainTest.java
View File

@@ -34,10 +34,10 @@ public class MainTest {
}
@Test public void put() throws IOException {
Request request = fromArgs("-X", "PUT", "http://example.com").createRequest();
Request request = fromArgs("-X", "PUT", "-d", "foo", "http://example.com").createRequest();
assertEquals("PUT", request.method());
assertEquals("http://example.com", request.urlString());
assertEquals(0, request.body().contentLength());
assertEquals(3, request.body().contentLength());
}
@Test public void dataPost() {

9
okhttp-android-support/src/main/java/com/squareup/okhttp/internal/huc/JavaApiConverter.java
View File

@@ -19,10 +19,12 @@ import com.squareup.okhttp.Handshake;
import com.squareup.okhttp.Headers;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import com.squareup.okhttp.Response;
import com.squareup.okhttp.ResponseBody;
import com.squareup.okhttp.internal.Util;
import com.squareup.okhttp.internal.http.CacheRequest;
import com.squareup.okhttp.internal.http.HttpMethod;
import com.squareup.okhttp.internal.http.OkHeaders;
import com.squareup.okhttp.internal.http.StatusLine;
import java.io.IOException;
@@ -51,6 +53,7 @@ import okio.Sink;
* Helper methods that convert between Java and OkHttp representations.
*/
public final class JavaApiConverter {
private static final RequestBody EMPTY_REQUEST_BODY = RequestBody.create(null, new byte[0]);
private JavaApiConverter() {
}
@@ -163,10 +166,14 @@ public final class JavaApiConverter {
*/
public static Request createOkRequest(
URI uri, String requestMethod, Map<String, List<String>> requestHeaders) {
// OkHttp's Call API requires a placeholder body; the real body will be streamed separately.
RequestBody placeholderBody = HttpMethod.requiresRequestBody(requestMethod)
? EMPTY_REQUEST_BODY
: null;
Request.Builder builder = new Request.Builder()
.url(uri.toString())
.method(requestMethod, null);
.method(requestMethod, placeholderBody);
if (requestHeaders != null) {
Headers headers = extractOkHeaders(requestHeaders);

2
okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java
View File

@@ -259,7 +259,7 @@ public final class CallTest {
Request request = new Request.Builder()
.url(server.getUrl("/"))
.method("POST", null)
.method("POST", RequestBody.create(null, new byte[0]))
.build();
executeSynchronously(request)

8
okhttp-urlconnection/src/main/java/com/squareup/okhttp/internal/huc/HttpURLConnectionImpl.java
View File

@@ -23,6 +23,7 @@ import com.squareup.okhttp.Headers;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Protocol;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.RequestBody;
import com.squareup.okhttp.Response;
import com.squareup.okhttp.Route;
import com.squareup.okhttp.internal.Internal;
@@ -73,6 +74,7 @@ import okio.Sink;
public class HttpURLConnectionImpl extends HttpURLConnection {
private static final Set<String> METHODS = new LinkedHashSet<>(
Arrays.asList("OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "PATCH"));
private static final RequestBody EMPTY_REQUEST_BODY = RequestBody.create(null, new byte[0]);
final OkHttpClient client;
@@ -314,9 +316,13 @@ public class HttpURLConnectionImpl extends HttpURLConnection {
private HttpEngine newHttpEngine(String method, Connection connection,
RetryableSink requestBody, Response priorResponse) {
// OkHttp's Call API requires a placeholder body; the real body will be streamed separately.
RequestBody placeholderBody = HttpMethod.requiresRequestBody(method)
? EMPTY_REQUEST_BODY
: null;
Request.Builder builder = new Request.Builder()
.url(getURL())
.method(method, null /* No body; that's passed separately. */);
.method(method, placeholderBody);
Headers headers = requestHeaders.build();
for (int i = 0, size = headers.size(); i < size; i++) {
builder.addHeader(headers.name(i), headers.value(i));

7
okhttp/src/main/java/com/squareup/okhttp/Request.java
View File

@@ -16,7 +16,6 @@
package com.squareup.okhttp;
import com.squareup.okhttp.internal.Platform;
import com.squareup.okhttp.internal.Util;
import com.squareup.okhttp.internal.http.HttpMethod;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -215,7 +214,7 @@ public final class Request {
}
public Builder delete() {
return method("DELETE", null);
return delete(RequestBody.create(null, new byte[0]));
}
public Builder put(RequestBody body) {
@@ -233,8 +232,8 @@ public final class Request {
if (body != null && !HttpMethod.permitsRequestBody(method)) {
throw new IllegalArgumentException("method " + method + " must not have a request body.");
}
if (body == null && HttpMethod.permitsRequestBody(method)) {
body = RequestBody.create(null, Util.EMPTY_BYTE_ARRAY);
if (body == null && HttpMethod.requiresRequestBody(method)) {
throw new IllegalArgumentException("method " + method + " must have a request body.");
}
this.method = method;
this.body = body;