http proxy対応出来ていなかったので対応

siosio · Jan 10, 2018 · 2bd01c5 · 2bd01c5
1 parent b0ba003
commit 2bd01c5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/siosio/Client.kt b/src/main/java/siosio/Client.kt
@@ -1,13 +1,26 @@
 package siosio
 
+import com.intellij.util.net.*
+import org.apache.http.client.config.*
 import org.apache.http.client.methods.*
 import org.apache.http.impl.client.*
+import java.util.concurrent.*
 
 object Client {
 
     fun get(uri: String): String {
-        val response = HttpClients.createDefault()
-                .execute(HttpGet(uri))
+        val clientBuilder = RequestConfig.custom()
+        IdeHttpClientHelpers.ApacheHttpClient4.setProxyForUrlIfEnabled(clientBuilder, uri)
+
+        val response: CloseableHttpResponse = try {
+            HttpClients.custom()
+                    .setDefaultRequestConfig(clientBuilder.build())
+                    .setConnectionTimeToLive(1, TimeUnit.SECONDS)
+                    .build()
+                    .execute(HttpGet(uri))
+        } catch (e: Exception) {
+            return ""
+        }
 
         return when (response.statusLine.statusCode) {
             200 -> response.entity.content.reader().readText()

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>GradleDependenciesHelper</id>
   <name>Gradle Dependencies Helper</name>
-  <version>1.10</version>
+  <version>1.11</version>
   <vendor email="siosio12@gmail.com" url="https://github.com/siosio/GradleDependenciesHelperPlugin">siosio</vendor>
   <depends>org.jetbrains.plugins.gradle</depends>
   <depends>org.intellij.groovy</depends>