- Adding configuration class.

- timeout could be set now

Author: stritti

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

@@ -44,12 +44,11 @@
 public class Airtable {
 
     private static final Logger LOG = LoggerFactory.getLogger( Airtable.class );
-    private static final String ENDPOINT_URL = "https://api.airtable.com/v0";
+
     private static final String AIRTABLE_API_KEY = "AIRTABLE_API_KEY";
     private static final String AIRTABLE_BASE = "AIRTABLE_BASE";
 
-    private String  endpointUrl;
-    private String apiKey;
+    private Configuration config;
 
     /**
      * Configure, <code>AIRTABLE_API_KEY</code> passed by Java property, enviroment variable
@@ -86,29 +85,32 @@ public Airtable configure() throws AirtableException {
      */
     @SuppressWarnings("WeakerAccess")
     public Airtable configure(String apiKey) throws AirtableException {
-        return configure(apiKey, ENDPOINT_URL);
+        return configure(new Configuration(apiKey, Configuration.ENDPOINT_URL));
     }
 
     /**
      *
-     * @param apiKey
-     * @param endpointUrl
+     * @param config
      * @return
      * @throws com.sybit.airtable.exception.AirtableException Missing API-Key or Endpoint
      */
     @SuppressWarnings("WeakerAccess")
-    public Airtable configure(String apiKey, String endpointUrl) throws AirtableException {
-        if(apiKey == null) {
+    public Airtable configure(Configuration config) throws AirtableException {
+        if(config.getApiKey() == null) {
             throw new AirtableException("Missing Airtable API-Key");
         }
-        if(endpointUrl == null) {
+        if(config.getEndpointUrl() == null) {
             throw new AirtableException("Missing endpointUrl");
         }
 
-        this.apiKey = apiKey;
-        this.endpointUrl = endpointUrl;
+        this.config = config;
 
-        setProxy(endpointUrl);
+        if(config.getTimeout() != null) {
+            LOG.info("Set connection timeout to: " + config.getTimeout() + "ms.");
+            Unirest.setTimeouts(config.getTimeout(), config.getTimeout());
+        }
+
+        setProxy(config.getEndpointUrl());
 
         // Only one time
         Unirest.setObjectMapper(new GsonObjectMapper());
@@ -190,20 +192,29 @@ public Base base(String base) throws AirtableException {
         return b;
     }
 
+    public Configuration getConfig() {
+        return config;
+    }
+
+    public void setConfig(Configuration config) {
+        this.config = config;
+        setProxy(config.getEndpointUrl());
+    }
+
     /**
      *
      * @return
      */
     public String endpointUrl() {
-        return endpointUrl;
+        return this.config.getEndpointUrl();
     }
 
     /**
      *
      * @return
      */
     public String apiKey() {
-        return apiKey;
+        return this.config.getApiKey();
     }
 
     /**
@@ -235,7 +246,7 @@ private String getCredentialProperty(String key) {
     }
 
     public void setEndpointUrl(String endpointUrl) {
-        this.endpointUrl = endpointUrl;
+        this.config.setEndpointUrl(endpointUrl);
         setProxy(endpointUrl);
     }
 }

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

@@ -0,0 +1,72 @@
+/*
+ * The MIT License (MIT)
+ * Copyright (c) 2017 Sybit GmbH
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ */
+package com.sybit.airtable;
+
+/**
+ * Configuration settings for Airtable.
+ * Used by class <code>Airtable</code> to configure basic settings.
+ */
+public class Configuration {
+
+    public static final String ENDPOINT_URL = "https://api.airtable.com/v0";
+
+    private String  endpointUrl;
+    private String apiKey;
+    private Long timeout;
+
+    /**
+     * Configure API using given API Key and default endpoint.
+     *
+     * @param apiKey
+     */
+    public Configuration(String apiKey) {
+        this(apiKey, ENDPOINT_URL);
+
+    }
+    /**
+     * Configure API using given API Key and default endpointURL.
+     *
+     * @param apiKey
+     * @param endpointUrl
+     */
+    public Configuration(String apiKey, String endpointUrl) {
+        this.apiKey = apiKey;
+        this.endpointUrl = endpointUrl;
+    }
+
+    public String getEndpointUrl() {
+        return endpointUrl;
+    }
+
+    public void setEndpointUrl(String endpointUrl) {
+        this.endpointUrl = endpointUrl;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    /**
+     * Get connection timeout.
+     * @return
+     */
+    public Long getTimeout() {
+        return timeout;
+    }
+
+    /**
+     * Set connection timeout.
+     * @param timeout
+     */
+    public void setTimeout(Long timeout) {
+        this.timeout = timeout;
+    }
+}