Merge branch 'improvement/JAL-4409_implement_extra_schemes_in_getdown' into develop
[jalview.git] / src / jalview / analytics / Plausible.java
index ab2de77..bff0448 100644 (file)
@@ -29,7 +29,6 @@ import java.lang.invoke.MethodHandles;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap;
@@ -45,6 +44,7 @@ import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.util.ChannelProperties;
 import jalview.util.HttpUtils;
+import jalview.util.UserAgent;
 
 public class Plausible
 {
@@ -122,7 +122,7 @@ public class Plausible
     // random clientId to make User-Agent unique (to register analytic)
     clientId = String.format("%08x", new Random().nextInt());
 
-    USER_AGENT = HttpUtils.getUserAgent(
+    USER_AGENT = UserAgent.getUserAgent(
             MethodHandles.lookup().lookupClass().getCanonicalName() + " "
                     + clientId);
   }
@@ -213,8 +213,8 @@ public class Plausible
     try
     {
       URL url = new URL(urlSb.toString());
-      URLConnection urlConnection = url.openConnection();
-      HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
+      HttpURLConnection httpURLConnection = (HttpURLConnection) HttpUtils
+              .openConnection(url);
       httpURLConnection.setRequestMethod("POST");
       httpURLConnection.setDoOutput(true);
 
@@ -553,8 +553,8 @@ public class Plausible
     try
     {
       URL url = new URL(CONFIG_API_BASE_URL);
-      URLConnection urlConnection = url.openConnection();
-      HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
+      HttpURLConnection httpURLConnection = (HttpURLConnection) HttpUtils
+              .openConnection(url);
       httpURLConnection.setRequestMethod("GET");
       httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
       httpURLConnection.setConnectTimeout(5000);