Move converter into the main package, remove Gson from core.

This change means that only RequestBody and ResponseBody are the types which are allowed for their respective objects by default. If you want serialization of any kind, you need to opt-in with either your own converter or one of the provided ones.

retrofit-adapters/rxjava/src/test/java/retrofit/ObservableCallAdapterFactoryTest.java

@@ -15,7 +15,7 @@
  */
 package retrofit;
 
-import com.google.gson.reflect.TypeToken;
+import com.google.common.reflect.TypeToken;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.RequestBody;
 import com.squareup.okhttp.ResponseBody;
@@ -27,7 +27,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import retrofit.converter.Converter;
 import retrofit.http.GET;
 import rx.Observable;
 import rx.observables.BlockingObservable;
@@ -202,7 +201,7 @@ static class StringConverter implements Converter {
     }
 
     @Override public RequestBody toBody(Object object, Type type) {
-      return RequestBody.create(MediaType.parse("text/plain"), String.valueOf(type));
+      return RequestBody.create(MediaType.parse("text/plain"), String.valueOf(object));
     }
   }
 }

retrofit-converters/gson/README.md

@@ -0,0 +1,10 @@
+Gson Converter
+==============
+
+A `Converter` which uses [Gson][1] for serialization to and from JSON.
+
+A default `Gson` instance will be created or one can be configured and passed to the
+`GsonConverter` construction to further control the serialization.
+
+
+ [1]: https://github.com/google/gson

retrofit-converters/gson/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.squareup.retrofit</groupId>
+    <artifactId>retrofit-converters</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>converter-gson</artifactId>
+  <name>Converter: Gson</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.squareup.retrofit</groupId>
+      <artifactId>retrofit</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

retrofit/src/main/java/retrofit/converter/GsonConverter.java → retrofit-converters/gson/src/main/java/retrofit/GsonConverter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package retrofit.converter;
+package retrofit;
 
 import com.google.gson.Gson;
 import com.squareup.okhttp.MediaType;

retrofit/src/test/java/retrofit/converter/GsonConverterTest.java → retrofit-converters/gson/src/test/java/retrofit/GsonConverterTest.java

@@ -1,5 +1,5 @@
 // Copyright 2015 Square, Inc.
-package retrofit.converter;
+package retrofit;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

retrofit-converters/jackson/src/main/java/retrofit/converter/JacksonConverter.java → retrofit-converters/jackson/src/main/java/retrofit/JacksonConverter.java

@@ -1,4 +1,4 @@
-package retrofit.converter;
+package retrofit;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;

retrofit-converters/jackson/src/test/java/retrofit/converter/JacksonConverterTest.java → retrofit-converters/jackson/src/test/java/retrofit/JacksonConverterTest.java

@@ -1,4 +1,4 @@
-package retrofit.converter;
+package retrofit;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;

retrofit-converters/pom.xml

@@ -15,6 +15,7 @@
   <packaging>pom</packaging>
 
   <modules>
+    <module>gson</module>
     <module>protobuf</module>
     <module>jackson</module>
     <module>wire</module>

retrofit-converters/protobuf/src/main/java/retrofit/converter/ProtoConverter.java → retrofit-converters/protobuf/src/main/java/retrofit/ProtoConverter.java

@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.converter;
+package retrofit;
 
 import com.google.protobuf.AbstractMessageLite;
 import com.squareup.okhttp.MediaType;

retrofit-converters/protobuf/src/test/java/retrofit/converter/ProtoConverterTest.java → retrofit-converters/protobuf/src/test/java/retrofit/ProtoConverterTest.java

@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.converter;
+package retrofit;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.squareup.okhttp.MediaType;
@@ -14,7 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
-import static retrofit.converter.PhoneProtos.Phone;
+import static retrofit.PhoneProtos.Phone;
 
 public final class ProtoConverterTest {
   private static final Phone PROTO = Phone.newBuilder().setNumber("(519) 867-5309").build();

retrofit-converters/protobuf/src/test/protos/phone.proto

@@ -1,6 +1,6 @@
 package retrofit;
 
-option java_package = "retrofit.converter";
+option java_package = "retrofit";
 option java_outer_classname = "PhoneProtos";
 
 message Phone {

retrofit-converters/simplexml/src/main/java/retrofit/converter/SimpleXmlConverter.java → retrofit-converters/simplexml/src/main/java/retrofit/SimpleXmlConverter.java

@@ -1,4 +1,4 @@
-package retrofit.converter;
+package retrofit;
 
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.RequestBody;

retrofit-converters/simplexml/src/test/java/retrofit/converter/SimpleXmlConverterTest.java → retrofit-converters/simplexml/src/test/java/retrofit/SimpleXmlConverterTest.java

@@ -1,4 +1,4 @@
-package retrofit.converter;
+package retrofit;
 
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.RequestBody;

retrofit-converters/wire/src/main/java/retrofit/converter/WireConverter.java → retrofit-converters/wire/src/main/java/retrofit/WireConverter.java

@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.converter;
+package retrofit;
 
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.RequestBody;

retrofit-converters/wire/src/test/java/retrofit/converter/Person.java → retrofit-converters/wire/src/test/java/retrofit/Person.java

@@ -1,6 +1,6 @@
 // Code generated by Wire protocol buffer compiler, do not edit.
 // Source file: ../wire-runtime/src/test/proto/person.proto
-package retrofit.converter;
+package retrofit;
 
 import com.squareup.wire.Message;
 import com.squareup.wire.ProtoEnum;

retrofit-converters/wire/src/test/java/retrofit/converter/WireConverterTest.java → retrofit-converters/wire/src/test/java/retrofit/WireConverterTest.java

@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.converter;
+package retrofit;
 
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.RequestBody;