Merge pull request #367 from lhDream/master

Increase file download timeout

Author: fvarrui

README.md

@@ -15,6 +15,7 @@ It was born while teaching to my students how to build and distribute their Java
 
 - [AstroImageJ](http://astroimagej.com/)
 - [Astro Pixel Processor](https://www.astropixelprocessor.com/)
+- [Drifty](https://github.com/SaptarshiSarkar12/Drifty)
 - [GistFX](https://github.com/RedmondSims/GistFX)
 - [Spektar Design Lab](https://spektar.io/)
 

src/main/java/io/github/fvarrui/javapackager/maven/ResolveLicenseFromPOM.java

@@ -42,7 +42,7 @@ protected File doApply(Packager packager) {
 			} catch (MalformedURLException e) {
 				Logger.error("Invalid license URL specified: " + urlStr);
 				licenseFile = null;
-			} catch (IOException e) {
+			} catch (Exception e) {
 				Logger.error("Cannot download license from " + urlStr);
 				licenseFile = null;
 			}

src/main/java/io/github/fvarrui/javapackager/utils/FileUtils.java

@@ -14,6 +14,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -313,8 +314,9 @@ public static File findFirstFile(File searchFolder, String regex) {
 	 * @param file File to copy the downloaded resource
 	 * @throws IOException Resource cannot be copied/downloaded
 	 */
-	public static void downloadFromUrl(URL url, File file) throws IOException {
-		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
+	public static void downloadFromUrl(URL url, File file) throws Exception {
+//		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
+		copyUrlToFile(url,file);
 		Logger.info("File downloaded from [" + url + "] to [" + file.getAbsolutePath() + "]");
 	}
 
@@ -325,7 +327,7 @@ public static void downloadFromUrl(URL url, File file) throws IOException {
 	 * @param file File to copy the downloaded resource
 	 * @throws IOException Resource cannot be copied/downloaded
 	 */
-	public static void downloadFromUrl(String url, File file) throws IOException {
+	public static void downloadFromUrl(String url, File file) throws Exception {
 		downloadFromUrl(new URL(url), file);
 	}
 
@@ -366,4 +368,36 @@ public static void writeStringToFileWithBOM(File output, String data) throws Exc
 		fileOutputStream.close();
 	}
 
+	/**
+	 *
+	 * @param url URL to download
+	 * @param file File to copy the downloaded resource
+	 * @throws Exception if something goes wrong
+	 */
+	public static void copyUrlToFile(URL url,File file) throws Exception {
+		copyUrlToFile(url,file,30000);
+	}
+
+	/**
+	 *
+	 * @param url URL to download
+	 * @param file File to copy the downloaded resource
+	 * @param timeout Download timeout (ms)
+	 * @throws Exception if something goes wrong
+	 */
+	public static void copyUrlToFile(URL url,File file,int timeout) throws Exception {
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.setConnectTimeout(timeout);
+		connection.setReadTimeout(timeout);
+		if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+			try (InputStream in = connection.getInputStream();
+				 FileOutputStream out = new FileOutputStream(file)) {
+				IOUtils.copy(in, out);
+			}
+		} else {
+			Logger.warn("Failed to download the file. Response code: " + connection.getResponseCode());
+		}
+		connection.disconnect();
+	}
+
 }