Merge branch 'develop' of https://github.com/hubrick/airtable.java into feature/allow-object-mapper-injection

# Conflicts:
#	.travis.yml
#	build.gradle
#	src/main/java/com/sybit/airtable/Airtable.java

Author: kobisuissa

…t/airtable/TableSelectJacksonOMTest.java …t/airtable/TableSelectJacksonOMTest.javasrc/test/java/com/sybit/airtable/TableSelectJacksonOMTest.java renamed to src/itest/java/com/sybit/airtable/TableSelectJacksonOMTest.java src/test/java/com/sybit/airtable/TableSelectJacksonOMTest.java renamed to src/itest/java/com/sybit/airtable/TableSelectJacksonOMTest.java

@@ -5,7 +5,7 @@
 import com.sybit.airtable.exception.AirtableException;
 import com.sybit.airtable.movies.ActorSerializedNames;
 import com.sybit.airtable.movies.Movie;
-import com.sybit.airtable.test.WireMockBaseTest;
+import com.sybit.airtable.mock.WireMockBaseTest;
 import org.apache.http.client.HttpResponseException;
 import org.junit.Before;
 import org.junit.Test;

src/main/java/com/sybit/airtable/Airtable.java

@@ -122,6 +122,19 @@ public Airtable configure(String apiKey, ObjectMapper objectMapper) throws Airta
      * @throws com.sybit.airtable.exception.AirtableException Missing API-Key or Endpoint
      */
     @SuppressWarnings("WeakerAccess")
+    public Airtable configure(Configuration config) throws AirtableException {
+        return configure(config, new GsonObjectMapper());
+    }
+
+
+    /**
+     *
+     * @param config
+     * @param objectMapper A custom ObjectMapper implementation
+     * @return
+     * @throws com.sybit.airtable.exception.AirtableException Missing API-Key or Endpoint
+     */
+    @SuppressWarnings("WeakerAccess")
     public Airtable configure(Configuration config, ObjectMapper objectMapper) throws AirtableException {
         if(config.getApiKey() == null) {
             throw new AirtableException("Missing Airtable API-Key");
@@ -140,7 +153,7 @@ public Airtable configure(Configuration config, ObjectMapper objectMapper) throw
         setProxy(config.getEndpointUrl());
 
         // Only one time
-        Unirest.setObjectMapper(new GsonObjectMapper());
+        Unirest.setObjectMapper(objectMapper);
 
         // Add specific Converter for Date
         DateTimeConverter dtConverter = new DateConverter();