Allow Void as first-party supported response body type.
Unlike just specifying `ResponseBody` (which buffers the body), `Void` would just close the underlying body after capturing the metadata.

retrofit/src/main/java/retrofit/OkHttpBodyConverterFactory.java retrofit/src/main/java/retrofit/Retrofit.java
retrofit/src/main/java/retrofit/BuiltInConverterFactory.java retrofit/src/main/java/retrofit/Retrofit.java retrofit/src/main/java/retrofit/VoidConverter.java
retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterFactoryTest.java retrofit-converters/wire/src/test/java/retrofit/WireConverterFactoryTest.java retrofit/src/test/java/retrofit/RequestBuilderTest.java retrofit/src/test/java/retrofit/RetrofitTest.java
diff --git a/retrofit/src/main/java/retrofit/OkHttpBodyConverterFactory.java b/retrofit/src/main/java/retrofit/BuiltInConverterFactory.java
similarity index 90%
rename from retrofit/src/main/java/retrofit/OkHttpBodyConverterFactory.java
rename to retrofit/src/main/java/retrofit/BuiltInConverterFactory.java
index a7281ea204..820a260203 100644
--- a/retrofit/src/main/java/retrofit/OkHttpBodyConverterFactory.java
+++ b/retrofit/src/main/java/retrofit/BuiltInConverterFactory.java
@@ -21,7 +21,7 @@
 import java.lang.reflect.Type;
 import retrofit.http.Streaming;
 
-final class OkHttpBodyConverterFactory implements Converter.Factory {
+final class BuiltInConverterFactory implements Converter.Factory {
   @Override public Converter<?> get(Type type, Annotation[] annotations) {
     if (!(type instanceof Class)) {
       return null;
@@ -34,6 +34,9 @@ final class OkHttpBodyConverterFactory implements Converter.Factory {
       boolean streaming = Utils.isAnnotationPresent(annotations, Streaming.class);
       return new OkHttpResponseBodyConverter(streaming);
     }
+    if (cls == Void.class) {
+      return new VoidConverter();
+    }
     return null;
   }
 }
diff --git a/retrofit/src/main/java/retrofit/Retrofit.java b/retrofit/src/main/java/retrofit/Retrofit.java
index 8885183c8d..568ac3c952 100644
--- a/retrofit/src/main/java/retrofit/Retrofit.java
+++ b/retrofit/src/main/java/retrofit/Retrofit.java
@@ -179,6 +179,12 @@ public static final class Builder {
     private List<CallAdapter.Factory> adapterFactories = new ArrayList<>();
     private Executor callbackExecutor;
 
+    public Builder() {
+      // Add the built-in converter factory first. This prevents overriding its behavior but also
+      // ensures correct behavior when using converters that consume all types.
+      converterFactories.add(new BuiltInConverterFactory());
+    }
+
     /** The HTTP client used for requests. */
     public Builder client(OkHttpClient client) {
       this.client = checkNotNull(client, "client == null");
@@ -264,9 +270,8 @@ public Retrofit build() {
       List<CallAdapter.Factory> adapterFactories = new ArrayList<>(this.adapterFactories);
       adapterFactories.add(Platform.get().defaultCallAdapterFactory(callbackExecutor));
 
-      // Make a defensive copy of the converters and add the default OkHttp body converter.
+      // Make a defensive copy of the converters.
       List<Converter.Factory> converterFactories = new ArrayList<>(this.converterFactories);
-      converterFactories.add(new OkHttpBodyConverterFactory());
 
       return new Retrofit(client, baseUrl, converterFactories, adapterFactories, callbackExecutor);
     }
diff --git a/retrofit/src/main/java/retrofit/VoidConverter.java b/retrofit/src/main/java/retrofit/VoidConverter.java
new file mode 100644
index 0000000000..f1f7800e2a
--- /dev/null
+++ b/retrofit/src/main/java/retrofit/VoidConverter.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package retrofit;
+
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.ResponseBody;
+import java.io.IOException;
+
+final class VoidConverter implements Converter<Void> {
+  @Override public Void fromBody(ResponseBody body) throws IOException {
+    body.close();
+    return null;
+  }
+
+  @Override public RequestBody toBody(Void value) {
+    throw new UnsupportedOperationException();
+  }
+}

diff --git a/retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterFactoryTest.java b/retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterFactoryTest.java
index 1a91f493c4..25d683f8f9 100644
--- a/retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterFactoryTest.java
+++ b/retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterFactoryTest.java
@@ -89,8 +89,8 @@ interface Service {
           + "    for method Service.wrongClass");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for class java.lang.String. Tried:\n"
-              + " * retrofit.ProtoConverterFactory\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory\n"
+              + " * retrofit.ProtoConverterFactory");
     }
   }
 
@@ -106,8 +106,8 @@ interface Service {
           + "    for method Service.wrongType");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for java.util.List<java.lang.String>. Tried:\n"
-              + " * retrofit.ProtoConverterFactory\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory\n"
+              + " * retrofit.ProtoConverterFactory");
     }
   }
 
diff --git a/retrofit-converters/wire/src/test/java/retrofit/WireConverterFactoryTest.java b/retrofit-converters/wire/src/test/java/retrofit/WireConverterFactoryTest.java
index 3d22ca7d2c..445617a501 100644
--- a/retrofit-converters/wire/src/test/java/retrofit/WireConverterFactoryTest.java
+++ b/retrofit-converters/wire/src/test/java/retrofit/WireConverterFactoryTest.java
@@ -88,8 +88,8 @@ interface Service {
           + "    for method Service.wrongClass");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for class java.lang.String. Tried:\n"
-              + " * retrofit.WireConverterFactory\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory\n"
+              + " * retrofit.WireConverterFactory");
     }
   }
 
@@ -105,8 +105,8 @@ interface Service {
           + "    for method Service.wrongType");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for java.util.List<java.lang.String>. Tried:\n"
-              + " * retrofit.WireConverterFactory\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory\n"
+              + " * retrofit.WireConverterFactory");
     }
   }
 
diff --git a/retrofit/src/test/java/retrofit/RequestBuilderTest.java b/retrofit/src/test/java/retrofit/RequestBuilderTest.java
index b2b64fdced..826b274726 100644
--- a/retrofit/src/test/java/retrofit/RequestBuilderTest.java
+++ b/retrofit/src/test/java/retrofit/RequestBuilderTest.java
@@ -1662,7 +1662,7 @@ private Request buildRequest(Class<?> cls, Object... args) {
       }
     };
     List<Converter.Factory> converterFactories =
-        Arrays.asList(new ToStringConverterFactory(), new OkHttpBodyConverterFactory());
+        Arrays.asList(new BuiltInConverterFactory(), new ToStringConverterFactory());
 
     RequestFactory requestFactory = RequestFactoryParser.parse(method, baseUrl, converterFactories);
     return requestFactory.create(args);
diff --git a/retrofit/src/test/java/retrofit/RetrofitTest.java b/retrofit/src/test/java/retrofit/RetrofitTest.java
index 361518a466..2eaaa23ee1 100644
--- a/retrofit/src/test/java/retrofit/RetrofitTest.java
+++ b/retrofit/src/test/java/retrofit/RetrofitTest.java
@@ -64,8 +64,9 @@ public final class RetrofitTest {
   interface CallMethod {
     @GET("/") Call<String> disallowed();
     @POST("/") Call<ResponseBody> disallowed(@Body String body);
-    @GET("/") Call<ResponseBody> allowed();
-    @POST("/") Call<ResponseBody> allowed(@Body RequestBody body);
+    @GET("/") Call<ResponseBody> getResponseBody();
+    @GET("/") Call<Void> getVoid();
+    @POST("/") Call<ResponseBody> postRequestBody(@Body RequestBody body);
   }
   interface FutureMethod {
     @GET("/") Future<String> method();
@@ -90,8 +91,8 @@ interface CustomConverter {
     @POST("/b") Call<CharSequence> call(@Body CharSequence charSequence);
   }
   interface Annotated {
-    @GET("/") @Foo Call<ResponseBody> method();
-    @POST("/") Call<ResponseBody> parameter(@Foo @Body RequestBody param);
+    @GET("/") @Foo Call<String> method();
+    @POST("/") Call<ResponseBody> parameter(@Foo @Body String param);
 
     @Retention(RUNTIME)
     @interface Foo {}
@@ -141,7 +142,7 @@ interface Annotated {
         .baseUrl(server.url("/"))
         .build();
     CallMethod example = retrofit.create(CallMethod.class);
-    assertThat(example.allowed()).isNotNull();
+    assertThat(example.getResponseBody()).isNotNull();
   }
 
   @Test public void callCallCustomAdapter() {
@@ -171,7 +172,7 @@ class MyCallAdapterFactory implements CallAdapter.Factory {
         .addCallAdapterFactory(new MyCallAdapterFactory())
         .build();
     CallMethod example = retrofit.create(CallMethod.class);
-    assertThat(example.allowed()).isNotNull();
+    assertThat(example.getResponseBody()).isNotNull();
     assertThat(factoryCalled.get()).isTrue();
     assertThat(adapterCalled.get()).isTrue();
   }
@@ -213,6 +214,7 @@ class MyCallAdapterFactory implements CallAdapter.Factory {
     }
     Retrofit retrofit = new Retrofit.Builder()
         .baseUrl(server.url("/"))
+        .addConverterFactory(new ToStringConverterFactory())
         .addCallAdapterFactory(new MyCallAdapterFactory())
         .build();
     Annotated annotated = retrofit.create(Annotated.class);
@@ -245,7 +247,7 @@ class MyCallAdapterFactory implements CallAdapter.Factory {
     class MyConverterFactory implements Converter.Factory {
       @Override public Converter<?> get(Type type, Annotation[] annotations) {
         annotationsRef.set(annotations);
-        return null;
+        return new ToStringConverterFactory.StringConverter();
       }
     }
     Retrofit retrofit = new Retrofit.Builder()
@@ -263,10 +265,10 @@ class MyConverterFactory implements Converter.Factory {
     final AtomicReference<Annotation[]> annotationsRef = new AtomicReference<>();
     class MyConverterFactory implements Converter.Factory {
       @Override public Converter<?> get(Type type, Annotation[] annotations) {
-        if (type == RequestBody.class) {
+        if (type == String.class) {
           annotationsRef.set(annotations);
         }
-        return null;
+        return new ToStringConverterFactory.StringConverter();
       }
     }
     Retrofit retrofit = new Retrofit.Builder()
@@ -294,7 +296,7 @@ class MyConverterFactory implements Converter.Factory {
               + "    for method CallMethod.disallowed");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for class java.lang.String. Tried:\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory");
     }
   }
 
@@ -314,7 +316,7 @@ class MyConverterFactory implements Converter.Factory {
           + "    for method CallMethod.disallowed");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for class java.lang.String. Tried:\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory");
     }
   }
 
@@ -337,8 +339,8 @@ class MyConverterFactory implements Converter.Factory {
           + "    for method CallMethod.disallowed");
       assertThat(e.getCause()).hasMessage(
           "Could not locate converter for class java.lang.String. Tried:\n"
-              + " * retrofit.RetrofitTest$3\n"
-              + " * retrofit.OkHttpBodyConverterFactory");
+              + " * retrofit.BuiltInConverterFactory\n"
+              + " * retrofit.RetrofitTest$3");
     }
   }
 
@@ -350,10 +352,22 @@ class MyConverterFactory implements Converter.Factory {
 
     server.enqueue(new MockResponse().setBody("Hi"));
 
-    Response<ResponseBody> response = example.allowed().execute();
+    Response<ResponseBody> response = example.getResponseBody().execute();
     assertThat(response.body().string()).isEqualTo("Hi");
   }
 
+  @Test public void voidOutgoingAllowed() throws IOException {
+    Retrofit retrofit = new Retrofit.Builder()
+        .baseUrl(server.url("/"))
+        .build();
+    CallMethod example = retrofit.create(CallMethod.class);
+
+    server.enqueue(new MockResponse().setBody("Hi"));
+
+    Response<Void> response = example.getVoid().execute();
+    assertThat(response.body()).isNull();
+  }
+
   @Test public void responseBodyIncomingAllowed() throws IOException, InterruptedException {
     Retrofit retrofit = new Retrofit.Builder()
         .baseUrl(server.url("/"))
@@ -363,7 +377,7 @@ class MyConverterFactory implements Converter.Factory {
     server.enqueue(new MockResponse().setBody("Hi"));
 
     RequestBody body = RequestBody.create(MediaType.parse("text/plain"), "Hey");
-    Response<ResponseBody> response = example.allowed(body).execute();
+    Response<ResponseBody> response = example.postRequestBody(body).execute();
     assertThat(response.body().string()).isEqualTo("Hi");
 
     assertThat(server.takeRequest().getBody().readUtf8()).isEqualTo("Hey");
@@ -521,7 +535,7 @@ class MyConverterFactory implements Converter.Factory {
         .build();
     List<Converter.Factory> converterFactories = retrofit.converterFactories();
     assertThat(converterFactories).hasSize(1);
-    assertThat(converterFactories.get(0)).isInstanceOf(OkHttpBodyConverterFactory.class);
+    assertThat(converterFactories.get(0)).isInstanceOf(BuiltInConverterFactory.class);
   }
 
   @Test public void converterFactoryPropagated() {
@@ -631,7 +645,7 @@ class MyConverterFactory implements Converter.Factory {
         .callbackExecutor(executor)
         .build();
     CallMethod service = retrofit.create(CallMethod.class);
-    Call<ResponseBody> call = service.allowed();
+    Call<ResponseBody> call = service.getResponseBody();
 
     server.enqueue(new MockResponse());
 
@@ -662,7 +676,7 @@ class MyConverterFactory implements Converter.Factory {
         .callbackExecutor(executor)
         .build();
     CallMethod service = retrofit.create(CallMethod.class);
-    Call<ResponseBody> call = service.allowed();
+    Call<ResponseBody> call = service.getResponseBody();
 
     server.enqueue(new MockResponse().setSocketPolicy(DISCONNECT_AT_START));
 
