Remove wdm.avoidReadReleaseFromRepository configuration key and assoc…

…iated logic
bonigarcia · Feb 21, 2024 · a374ae2 · a374ae2
1 parent 8c42b48
commit a374ae2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 46 deletions.
diff --git a/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java
@@ -20,7 +20,6 @@
 import static io.github.bonigarcia.wdm.config.Architecture.X32;
 import static io.github.bonigarcia.wdm.config.Architecture.X64;
 import static io.github.bonigarcia.wdm.config.Config.isNullOrEmpty;
-import static io.github.bonigarcia.wdm.config.DriverManagerType.CHROME;
 import static io.github.bonigarcia.wdm.config.DriverManagerType.CHROMIUM;
 import static io.github.bonigarcia.wdm.config.DriverManagerType.EDGE;
 import static io.github.bonigarcia.wdm.config.DriverManagerType.FIREFOX;
@@ -777,11 +776,6 @@ public WebDriverManager avoidFallback() {
         return this;
     }
 
-    public WebDriverManager avoidReadReleaseFromRepository() {
-        config().setAvoidReadReleaseFromRepository(true);
-        return this;
-    }
-
     public WebDriverManager avoidTmpFolder() {
         config().setAvoidTmpFolder(true);
         return this;
@@ -1411,18 +1405,7 @@ protected void handleException(Exception e, String driverVersion) {
                 driverVersionStr, e.getMessage());
         if (retryCount == 0 && !config().isAvoidFallback()) {
             retryCount++;
-            if (getDriverManagerType() == EDGE
-                    || getDriverManagerType() == CHROME) {
-                config().setAvoidReadReleaseFromRepository(true);
-                clearResolutionCache();
-                log.warn(
-                        "{} ... trying again avoiding reading release from repository",
-                        errorMessage);
-                manage("");
-            } else {
-                retryCount++;
-                fallback(e, errorMessage);
-            }
+            fallback(e, errorMessage);
 
         } else if (retryCount == 1 && !config().isAvoidFallback()) {
             fallback(e, errorMessage);
@@ -1690,11 +1673,10 @@ protected Optional<String> getOsLabel() {
 
     protected Optional<String> getDriverVersionFromRepository(
             Optional<String> driverVersion) {
-        return config().isAvoidReadReleaseFromRepository() ? empty()
-                : getVersionDetector().getDriverVersionFromRepository(
-                        driverVersion, getDriverUrl(), getVersionCharset(),
-                        getDriverName(), getLatestVersionLabel(),
-                        LATEST_RELEASE, getOsLabel());
+        return getVersionDetector().getDriverVersionFromRepository(
+                driverVersion, getDriverUrl(), getVersionCharset(),
+                getDriverName(), getLatestVersionLabel(), LATEST_RELEASE,
+                getOsLabel());
     }
 
     protected URL getDriverUrlCkeckingMirror(URL url) {

diff --git a/src/main/java/io/github/bonigarcia/wdm/config/Config.java b/src/main/java/io/github/bonigarcia/wdm/config/Config.java
@@ -79,8 +79,6 @@ public class Config {
             Boolean.class);
     ConfigKey<Boolean> avoidResolutionCache = new ConfigKey<>(
             "wdm.avoidResolutionCache", Boolean.class);
-    ConfigKey<Boolean> avoidReadReleaseFromRepository = new ConfigKey<>(
-            "wdm.avoidReadReleaseFromRepository", Boolean.class);
     ConfigKey<Boolean> avoidTmpFolder = new ConfigKey<>("wdm.avoidTmpFolder",
             Boolean.class);
     ConfigKey<Boolean> avoidShutdownHook = new ConfigKey<>(
@@ -526,15 +524,6 @@ public Config setAvoidResolutionCache(boolean value) {
         return this;
     }
 
-    public boolean isAvoidReadReleaseFromRepository() {
-        return resolve(avoidReadReleaseFromRepository);
-    }
-
-    public Config setAvoidReadReleaseFromRepository(boolean value) {
-        this.avoidReadReleaseFromRepository.setValue(value);
-        return this;
-    }
-
     public boolean isAvoidTmpFolder() {
         return resolve(avoidTmpFolder);
     }

diff --git a/src/main/java/io/github/bonigarcia/wdm/managers/ChromeDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/managers/ChromeDriverManager.java
@@ -132,8 +132,7 @@ protected List<URL> getDriverUrls(String driverVersion) throws IOException {
 
     @Override
     protected Optional<String> getLatestDriverVersionFromRepository() {
-        if (config().isUseBetaVersions()
-                || config().isAvoidReadReleaseFromRepository()) {
+        if (config().isUseBetaVersions()) {
             return empty();
         } else {
             return getDriverVersionFromRepository(empty());

diff --git a/src/main/java/io/github/bonigarcia/wdm/managers/EdgeDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/managers/EdgeDriverManager.java
@@ -144,8 +144,7 @@ protected List<File> postDownload(File archive) {
 
     @Override
     protected Optional<String> getLatestDriverVersionFromRepository() {
-        if (config().isUseBetaVersions()
-                || config().isAvoidReadReleaseFromRepository()) {
+        if (config().isUseBetaVersions()) {
             return empty();
         } else {
             return getDriverVersionFromRepository(empty());
@@ -192,9 +191,11 @@ Optional<URL> buildUrl(String driverVersion, Config config) {
             Architecture arch = config.getArchitecture();
             String archLabel = os.isWin() ? arch.toString() : "64";
             String osName = arch != ARM64 ? os.getName() : "arm";
-            String builtUrl = os == MAC && arch == ARM64 ?
-              String.format(downloadUrlPattern, driverVersion, "mac", "64_m1") :
-              String.format(downloadUrlPattern, driverVersion, osName, archLabel);
+            String builtUrl = os == MAC && arch == ARM64
+                    ? String.format(downloadUrlPattern, driverVersion, "mac",
+                            "64_m1")
+                    : String.format(downloadUrlPattern, driverVersion, osName,
+                            archLabel);
 
             log.debug("Using URL built from repository pattern: {}", builtUrl);
             try {

diff --git a/src/main/java/io/github/bonigarcia/wdm/managers/FirefoxDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/managers/FirefoxDriverManager.java
@@ -109,8 +109,7 @@ protected List<URL> getDriverUrls(String driverVersion) throws IOException {
 
     @Override
     protected Optional<String> getLatestDriverVersionFromRepository() {
-        if (config().isUseBetaVersions()
-                || config().isAvoidReadReleaseFromRepository()) {
+        if (config().isUseBetaVersions()) {
             return empty();
         } else {
             return getDriverVersionFromRepository(empty());

diff --git a/src/main/java/io/github/bonigarcia/wdm/managers/OperaDriverManager.java b/src/main/java/io/github/bonigarcia/wdm/managers/OperaDriverManager.java
@@ -105,8 +105,7 @@ protected void setDriverUrl(URL url) {
 
     @Override
     protected Optional<String> getLatestDriverVersionFromRepository() {
-        if (config().isUseBetaVersions()
-                || config().isAvoidReadReleaseFromRepository()) {
+        if (config().isUseBetaVersions()) {
             return empty();
         } else {
             return getDriverVersionFromRepository(empty());

diff --git a/src/main/resources/webdrivermanager.properties b/src/main/resources/webdrivermanager.properties
@@ -7,7 +7,6 @@ wdm.avoidOutputTree=false
 wdm.avoidBrowserDetection=false
 wdm.avoidResolutionCache=false
 wdm.avoidFallback=false
-wdm.avoidReadReleaseFromRepository=false
 wdm.avoidTmpFolder=false
 wdm.avoidShutdownHook=false
 wdm.avoidExternalConnections=false