remove redundant code (#1097)

This commit is contained in:
郑博
2020-06-09 03:10:49 +08:00
committed by GitHub
parent 6fb1d84c01
commit e7d130f1eb
@@ -16,11 +16,9 @@ import java.util.List;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import com.taobao.arthas.common.AnsiLog;
import com.taobao.arthas.common.IOUtils;
@@ -98,7 +96,7 @@ public class DownloadUtils {
public static String getRepoUrl(String repoMirror, boolean http) {
repoMirror = repoMirror.trim();
String repoUrl = "";
String repoUrl;
if (repoMirror.equals("center")) {
repoUrl = "https://repo1.maven.org/maven2";
} else if (repoMirror.equals("aliyun")) {
@@ -111,13 +109,13 @@ public class DownloadUtils {
}
if (http && repoUrl.startsWith("https")) {
repoUrl = "http" + repoUrl.substring("https".length(), repoUrl.length());
repoUrl = "http" + repoUrl.substring("https".length());
}
return repoUrl;
}
public static void downArthasPackaging(String repoMirror, boolean http, String arthasVersion, String savePath)
throws ParserConfigurationException, SAXException, IOException {
throws IOException {
String repoUrl = getRepoUrl(repoMirror, http);
File unzipDir = new File(savePath, arthasVersion + File.separator + "arthas");
@@ -134,7 +132,7 @@ public class DownloadUtils {
}
public static void saveUrl(final String filename, final String urlString, boolean printProgress)
throws MalformedURLException, IOException {
throws IOException {
BufferedInputStream in = null;
FileOutputStream fout = null;
try {
@@ -143,7 +141,7 @@ public class DownloadUtils {
List<String> values = connection.getHeaderFields().get("Content-Length");
int fileSize = 0;
if (values != null && !values.isEmpty()) {
String contentLength = (String) values.get(0);
String contentLength = values.get(0);
if (contentLength != null) {
// parse the length into an integer...
fileSize = Integer.parseInt(contentLength);
@@ -152,7 +150,7 @@ public class DownloadUtils {
fout = new FileOutputStream(filename);
final byte data[] = new byte[1024 * 1024];
final byte[] data = new byte[1024 * 1024];
int totalCount = 0;
int count;
long lastPrintTime = System.currentTimeMillis();
@@ -162,7 +160,7 @@ public class DownloadUtils {
long now = System.currentTimeMillis();
if (now - lastPrintTime > 1000) {
AnsiLog.info("File size: {}, downloaded size: {}, downloading ...", formatFileSize(fileSize),
formatFileSize(totalCount));
formatFileSize(totalCount));
lastPrintTime = now;
}
}
@@ -212,13 +210,13 @@ public class DownloadUtils {
private static URLConnection openURLConnection(String url) throws MalformedURLException, IOException {
URLConnection connection = new URL(url).openConnection();
if (connection instanceof HttpURLConnection) {
((HttpURLConnection) connection).setConnectTimeout(CONNECTION_TIMEOUT);
connection.setConnectTimeout(CONNECTION_TIMEOUT);
// normally, 3xx is redirect
int status = ((HttpURLConnection) connection).getResponseCode();
if (status != HttpURLConnection.HTTP_OK) {
if (status == HttpURLConnection.HTTP_MOVED_TEMP || status == HttpURLConnection.HTTP_MOVED_PERM
|| status == HttpURLConnection.HTTP_SEE_OTHER) {
String newUrl = ((HttpURLConnection) connection).getHeaderField("Location");
|| status == HttpURLConnection.HTTP_SEE_OTHER) {
String newUrl = connection.getHeaderField("Location");
AnsiLog.debug("Try to open url: {}, redirect to: {}", url, newUrl);
return openURLConnection(newUrl);
}
@@ -228,7 +226,7 @@ public class DownloadUtils {
}
private static String formatFileSize(long size) {
String hrSize = null;
String hrSize;
double b = size;
double k = size / 1024.0;