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

http: reduce chained exception count (location is still available in stacktrace, it's provided by HttpRequests.createErrorMessage(e, request, true))

Browse Source
This commit is contained in:
Sergey Simonchik
2017-01-20 13:03:41 +03:00
parent 62d2417879
commit e25ed4062b
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/platform/templates/github/DownloadUtil.java
+18 -27
View File
@@ -20,9 +20,6 @@ import java.io.OutputStream;
import java.util.Locale;
import java.util.concurrent.Callable;
/**
* @author Sergey Simonchik
*/
public class DownloadUtil {
public static final String CONTENT_LENGTH_TEMPLATE = "${content-length}";
@@ -159,36 +156,30 @@ public class DownloadUtil {
}
}
private static void download(@Nullable final ProgressIndicator progress,
private static void download(@Nullable ProgressIndicator progress,
@NotNull String location,
@NotNull final OutputStream output) throws IOException {
final String originalText = progress != null ? progress.getText() : null;
@NotNull OutputStream output) throws IOException {
String originalText = progress != null ? progress.getText() : null;
substituteContentLength(progress, originalText, -1);
if (progress != null) {
progress.setText2("Downloading " + location);
}
try {
HttpRequests.request(location)
.productNameAsUserAgent()
.connect(new HttpRequests.RequestProcessor<Object>() {
@Override
public Object process(@NotNull HttpRequests.Request request) throws IOException {
try {
int contentLength = request.getConnection().getContentLength();
substituteContentLength(progress, originalText, contentLength);
NetUtils.copyStreamContent(progress, request.getInputStream(), output, contentLength);
}
catch (IOException e) {
throw new IOException(HttpRequests.createErrorMessage(e, request, true), e);
}
return null;
HttpRequests.request(location)
.productNameAsUserAgent()
.connect(new HttpRequests.RequestProcessor<Object>() {
@Override
public Object process(@NotNull HttpRequests.Request request) throws IOException {
try {
int contentLength = request.getConnection().getContentLength();
substituteContentLength(progress, originalText, contentLength);
NetUtils.copyStreamContent(progress, request.getInputStream(), output, contentLength);
}
});
}
catch (IOException e) {
throw new IOException("Cannot download " + location, e);
}
catch (IOException e) {
throw new IOException(HttpRequests.createErrorMessage(e, request, true), e);
}
return null;
}
});
}
private static void substituteContentLength(@Nullable ProgressIndicator progress, @Nullable String text, int contentLengthInBytes) {