diff --git a/README.md b/README.md index 971be2e..bdea142 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Add this dependency to your project's POM: com.browserstack browserstack-local-java - 1.1.5 + 1.1.4 ``` diff --git a/pom.xml b/pom.xml index c372100..e4fc19b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.browserstack browserstack-local-java jar - 1.1.5 + 1.1.4-SNAPSHOT browserstack-local-java Java bindings for BrowserStack Local diff --git a/src/main/java/com/browserstack/local/Local.java b/src/main/java/com/browserstack/local/Local.java index 7669007..8e4cb34 100644 --- a/src/main/java/com/browserstack/local/Local.java +++ b/src/main/java/com/browserstack/local/Local.java @@ -23,7 +23,7 @@ public class Local { private LocalProcess proc = null; // Current version of binding package, used for --source option of binary - private static final String packageVersion = "1.1.5"; + private final String packageVersion = "1.1.4"; private final Map parameters; private final Map avoidValueParameters; @@ -130,15 +130,6 @@ public boolean isRunning() throws Exception { return isProcessRunning(pid); } - /** - * Returns the package version - * - * @return {String} package version - */ - public static String getPackageVersion() { - return packageVersion; - } - /** * Creates a list of command-line arguments for the Local instance * diff --git a/src/main/java/com/browserstack/local/LocalBinary.java b/src/main/java/com/browserstack/local/LocalBinary.java index 6c83156..5f088d0 100644 --- a/src/main/java/com/browserstack/local/LocalBinary.java +++ b/src/main/java/com/browserstack/local/LocalBinary.java @@ -2,15 +2,11 @@ import org.apache.commons.io.FileUtils; import java.io.IOException; -import java.io.InputStream; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.File; import java.net.URL; -import java.net.URLConnection; import java.util.regex.Pattern; -import java.util.zip.GZIPInputStream; -import java.util.zip.ZipException; class LocalBinary { @@ -62,8 +58,7 @@ private void initialize() throws LocalException { throw new LocalException("Failed to detect OS type"); } - String sourceURL = BIN_URL; - httpPath = sourceURL + binFileName; + httpPath = BIN_URL + binFileName; } private boolean isAlpine() { @@ -179,7 +174,7 @@ private void downloadBinary(String destParentDir, Boolean custom) throws LocalEx URL url = new URL(httpPath); File f = new File(source); - newCopyToFile(url, f); + FileUtils.copyURLToFile(url, f); changePermissions(binaryPath); } catch (Exception e) { @@ -197,26 +192,4 @@ private void changePermissions(String path) { public String getBinaryPath() { return binaryPath; } - - private static void newCopyToFile(URL url, File f) throws IOException { - URLConnection conn = url.openConnection(); - conn.setRequestProperty("User-Agent", "browserstack-local-java/" + Local.getPackageVersion()); - conn.setRequestProperty("Accept-Encoding", "gzip, *"); - String contentEncoding = conn.getContentEncoding(); - - if (contentEncoding == null || !contentEncoding.toLowerCase().contains("gzip")) { - FileUtils.copyToFile(conn.getInputStream(), f); - return; - } - - try (InputStream stream = new GZIPInputStream(conn.getInputStream())) { - if (System.getenv().containsKey("BROWSERSTACK_LOCAL_DEBUG_GZIP")) { - System.out.println("using gzip in " + conn.getRequestProperty("User-Agent")); - } - - FileUtils.copyToFile(stream, f); - } catch (ZipException e) { - FileUtils.copyURLToFile(url, f); - } - } }