Merge pull request #19 from Sybit-Education/develop

Proxy Fix

Author: Zelle97

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

@@ -179,9 +179,15 @@ public Airtable configure(Configuration config, ObjectMapper objectMapper) throw
      * @param proxy
      */
     public void setProxy(String proxy) {
-        if (proxy != null && !proxy.isEmpty() && !proxy.equals(" ")) {
+
+        if (proxy == null) {
+            this.config.setProxy(proxy);
+            Unirest.setProxy(null);
+        } else {
             this.config.setProxy(proxy);
+            Unirest.setProxy(HttpHost.create(this.config.getProxy()));
         }
+
     }
 
     /**
@@ -200,18 +206,22 @@ private void configureProxy(String endpointUrl) {
                     && (endpointUrl.contains("127.0.0.1")
                     || endpointUrl.contains("localhost"))) {
                 LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
-                this.config.setProxy(null);
+                setProxy(null);
             } else if (httpsProxy != null
                     && (endpointUrl.contains("https"))) {
                 LOG.info("Use Proxy: Environment variable 'https_proxy' found and used: " + httpsProxy);
-                this.config.setProxy(httpProxy);
+                setProxy(httpProxy);
             } else if (httpProxy != null
                     && (endpointUrl.contains("http"))) {
                 LOG.info("Use Proxy: Environment variable 'http_proxy' found and used: " + httpProxy);
-                this.config.setProxy(httpsProxy);
+                setProxy(httpsProxy);
             } else {
-                this.config.setProxy(null);
+                setProxy(null);
             }
+        } else if ((endpointUrl.contains("127.0.0.1")
+                || endpointUrl.contains("localhost"))) {
+            LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
+            setProxy(null);
         }
     }
 

src/test/java/com/sybit/airtable/BaseTest.java

@@ -23,7 +23,7 @@ public class BaseTest {
     @Before
     public void before() throws AirtableException{
 
-        this.airtable = new Airtable().configure(new Configuration("123","url",null));
+        this.airtable = new Airtable().configure(new Configuration("123","http://localhost",null));
 
 
     }

src/test/java/com/sybit/airtable/TableTest.java

@@ -23,7 +23,7 @@ public class TableTest {
     @Before
     public void before() throws AirtableException{
 
-        Airtable airtable = new Airtable().configure(new Configuration("123","url",null));
+        Airtable airtable = new Airtable().configure(new Configuration("123","https://url",null));
         this.base = new Base("base", airtable);
 
     }