CLDR-14409 make URL configurable, read from local file

Author: srl295

pom.xml

@@ -28,7 +28,7 @@
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
       <version>4.16.1</version>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>

src/test/java/org/unicode/cldr/surveydriver/SurveyDriver.java

@@ -69,7 +69,7 @@ public class SurveyDriver {
     /*
      * Configure for Survey Tool server, which can be localhost, cldr-smoke, cldr-staging, ...
      */
-    static final String BASE_URL = "http://localhost:9080/cldr-apps/";
+    static final String BASE_URL = SurveyDriverCredentials.getUrl() + "/cldr-apps/";
     // static final String BASE_URL = "https://cldr-smoke.unicode.org/cldr-apps/";
     // static final String BASE_URL = "https://cldr-staging.unicode.org/cldr-apps/";
 

src/test/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java

@@ -1,5 +1,6 @@
 package org.unicode.cldr.surveydriver;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
@@ -20,6 +21,7 @@ public class SurveyDriverCredentials {
     private static final String PROPS_FILENAME = "surveydriver.properties";
 
     private static final String PROPS_PASSWORD_KEY = "WEBDRIVER_PASSWORD";
+    private static final String PROPS_URL_KEY = "SURVEYTOOL_URL";
     private static String webdriverPassword = null;
 
     private final String email;
@@ -41,25 +43,63 @@ public String getEmail() {
         return email;
     }
 
+    private static final class PropsHelper {
+        public final Properties props = new java.util.Properties();
+
+        PropsHelper() {
+            if (!tryFromFile()) {
+                tryFromResource();
+            }
+        }
+
+        boolean tryFromFile() {
+            try (final InputStream stream = new FileInputStream(PROPS_FILENAME)) {
+                props.load(stream);
+                return true;
+            } catch (IOException e) {
+                System.err.println("While reading " + PROPS_FILENAME + " " + e);
+                e.printStackTrace();
+                return false;
+            }
+        }
+
+        void tryFromResource() {
+            final InputStream stream =
+                    SurveyDriverCredentials.class.getResourceAsStream(PROPS_FILENAME);
+            if (stream == null) {
+                throw new RuntimeException("File not found: " + PROPS_FILENAME);
+            }
+            try {
+                props.load(stream);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        static final PropsHelper INSTANCE = new PropsHelper();
+    }
+
+    public static Properties getProperties() {
+        return PropsHelper.INSTANCE.props;
+    }
+
     public String getPassword() {
         if (webdriverPassword != null) {
             return webdriverPassword;
         }
-        final InputStream stream =
-                SurveyDriverCredentials.class.getResourceAsStream(PROPS_FILENAME);
-        if (stream == null) {
-            throw new RuntimeException("File not found: " + PROPS_FILENAME);
-        }
-        final Properties props = new java.util.Properties();
-        try {
-            props.load(stream);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        webdriverPassword = (String) props.get(PROPS_PASSWORD_KEY);
+
+        webdriverPassword = (String) getProperties().get(PROPS_PASSWORD_KEY);
         if (webdriverPassword == null || webdriverPassword.isBlank()) {
             throw new RuntimeException("WEBDRIVER_PASSWORD not found in " + PROPS_FILENAME);
         }
         return webdriverPassword;
     }
+
+    public static String getUrl() {
+        String host = getProperties().get(PROPS_URL_KEY).toString();
+        if (host == null || host.isEmpty()) {
+            host = "http://localhost:9080";
+        }
+        return host;
+    }
 }