MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use HttpRequests, add HttpRequests.getString

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-12-22 13:18:54 +01:00
parent 2f73716a0e
commit b4bde8b206
2 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/util/io/HttpRequests.java
+35
View File
@@ -24,7 +24,9 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.SystemProperties;
import com.intellij.util.net.HttpConfigurable;
import com.intellij.util.net.NetUtils;
@@ -38,6 +40,7 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLConnection;
import java.nio.charset.Charset;
import java.util.zip.GZIPInputStream;
/**
@@ -194,10 +197,42 @@ public abstract class HttpRequests {
}
});
}
@NotNull
public String getString(@Nullable final ProgressIndicator indicator) throws IOException {
return connect(new HttpRequests.RequestProcessor<String>() {
@Override
public String process(@NotNull HttpRequests.Request request) throws IOException {
int contentLength = request.getConnection().getContentLength();
BufferExposingByteArrayOutputStream out = new BufferExposingByteArrayOutputStream(contentLength > 0 ? contentLength : 16 * 1024);
NetUtils.copyStreamContent(indicator, request.getInputStream(), out, contentLength);
Charset charset = CharsetToolkit.UTF8_CHARSET;
String contentEncoding = request.getConnection().getContentEncoding();
if (contentEncoding != null) {
try {
charset = Charset.forName(contentEncoding);
}
catch (Exception ignored) {
charset = CharsetToolkit.UTF8_CHARSET;
}
}
return new String(out.getInternalBuffer(), 0, out.size(), charset);
}
});
}
}
@NotNull
public static RequestBuilder request(@NotNull String url) {
if (ApplicationManager.getApplication() == null) {
try {
return ((HttpRequests)ReflectionUtil.newInstance(Class.forName("com.intellij.util.io.HttpRequestsImpl"))).createRequestBuilder(url);
}
catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
}
return ServiceManager.getService(HttpRequests.class).createRequestBuilder(url);
}
platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java
+8 -3
View File
@@ -22,10 +22,10 @@ import org.junit.Test;
import java.io.IOException;
import java.net.SocketTimeoutException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.*;
public class HttpRequestsTest {
public class HttpRequestsTest {
private final HttpRequests.RequestProcessor<Void> myProcessor = new HttpRequests.RequestProcessor<Void>() {
@SuppressWarnings("ResultOfMethodCallIgnored")
@Override
@@ -57,4 +57,9 @@ public class HttpRequestsTest {
HttpRequests.request("http://openjdk.java.net").readTimeout(1).connect(myProcessor);
fail();
}
@Test(timeout = 5000)
public void testReadString() throws IOException {
assertThat(HttpRequests.request("http://openjdk.java.net").getString(null), containsString("Download"));
}
}