Merge pull request #101 from PRIDE-Archive/proxyIssue

Proxy , HttpErrorCorrection And UpdateChecker
PRIDE-Archive · Aug 12, 2020 · 0cb1ed3 · 0cb1ed3
2 parents 3ca6e38 + cda39c2
commit 0cb1ed3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 36 deletions.
diff --git a/src/main/java/uk/ac/ebi/pride/gui/task/CompleteSubmissionTask.java b/src/main/java/uk/ac/ebi/pride/gui/task/CompleteSubmissionTask.java
@@ -1,9 +1,6 @@
 package uk.ac.ebi.pride.gui.task;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 import uk.ac.ebi.pride.App;
 import uk.ac.ebi.pride.archive.submission.model.submission.SubmissionReferenceDetail;
@@ -12,6 +9,8 @@
 import uk.ac.ebi.pride.toolsuite.gui.task.TaskAdapter;
 import uk.ac.ebi.pride.web.util.template.SecureRestTemplateFactory;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.Properties;
 
 /**
@@ -42,10 +41,9 @@ protected SubmissionReferenceDetail doInBackground() throws Exception {
             String proxyPort = props.getProperty("http.proxyPort");
 
             if (proxyHost != null && proxyPort != null) {
-                HttpComponentsClientHttpRequestFactory factory = ((HttpComponentsClientHttpRequestFactory) restTemplate.getRequestFactory());
-                DefaultHttpClient defaultHttpClient = (DefaultHttpClient) factory.getHttpClient();
-                HttpHost proxy = new HttpHost(proxyHost.trim(), Integer.parseInt(proxyPort));
-                defaultHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+                Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
+                SimpleClientHttpRequestFactory requestFactory = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
+                requestFactory.setProxy(proxy);
             }
             result = restTemplate.postForObject(baseUrl, submissionRecord.getUploadDetail(), SubmissionReferenceDetail.class);
         } catch(Exception ex){

diff --git a/src/main/java/uk/ac/ebi/pride/gui/task/GetPXSubmissionDetailTask.java b/src/main/java/uk/ac/ebi/pride/gui/task/GetPXSubmissionDetailTask.java
@@ -1,11 +1,8 @@
 package uk.ac.ebi.pride.gui.task;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 import uk.ac.ebi.pride.App;
 import uk.ac.ebi.pride.archive.submission.model.project.ProjectDetail;
@@ -15,6 +12,8 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.LinkedHashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -47,10 +46,10 @@ protected Set<String> doInBackground() throws Exception {
             String proxyPort = props.getProperty("http.proxyPort");
 
             if (proxyHost != null && proxyPort != null) {
-                HttpComponentsClientHttpRequestFactory factory = ((HttpComponentsClientHttpRequestFactory) restTemplate.getRequestFactory());
-                DefaultHttpClient defaultHttpClient = (DefaultHttpClient) factory.getHttpClient();
-                HttpHost proxy = new HttpHost(proxyHost.trim(), Integer.parseInt(proxyPort));
-                defaultHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+                logger.info("Using proxy server {} and port {}", proxyHost, proxyPort);
+                Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
+                SimpleClientHttpRequestFactory requestFactory = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
+                requestFactory.setProxy(proxy);
             }
             ProjectDetailList projectDetailList = restTemplate.getForObject(baseUrl, ProjectDetailList.class);
 

diff --git a/src/main/java/uk/ac/ebi/pride/gui/task/GetPrideUserDetailTask.java b/src/main/java/uk/ac/ebi/pride/gui/task/GetPrideUserDetailTask.java
@@ -1,16 +1,13 @@
 package uk.ac.ebi.pride.gui.task;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
 import uk.ac.ebi.pride.App;
@@ -19,6 +16,8 @@
 import uk.ac.ebi.pride.toolsuite.gui.desktop.DesktopContext;
 import uk.ac.ebi.pride.toolsuite.gui.task.TaskAdapter;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.Properties;
 
 /**
@@ -72,10 +71,9 @@ protected ContactDetail doInBackground() throws Exception {
 
             if (proxyHost != null && proxyPort != null) {
                 logger.info("Using proxy server {} and port {}", proxyHost, proxyPort);
-                HttpComponentsClientHttpRequestFactory factory = ((HttpComponentsClientHttpRequestFactory) restTemplate.getRequestFactory());
-                DefaultHttpClient defaultHttpClient = (DefaultHttpClient) factory.getHttpClient();
-                HttpHost proxy = new HttpHost(proxyHost.trim(), Integer.parseInt(proxyPort));
-                defaultHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+                Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
+                SimpleClientHttpRequestFactory requestFactory = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
+                requestFactory.setProxy(proxy);
             }
 
             HttpHeaders headers = new HttpHeaders();
@@ -89,7 +87,7 @@ protected ContactDetail doInBackground() throws Exception {
             return restTemplate.exchange(userDetailUrl, HttpMethod.GET, entity, ContactDetail.class).getBody();
         } catch (ResourceAccessException resourceAccessException) {
             publish("Proxy/Firewall issue");
-        } catch (HttpServerErrorException ex) {
+        } catch (HttpClientErrorException ex) {
             publish("UserCredentials mismatch");
         }
 

diff --git a/src/main/java/uk/ac/ebi/pride/gui/task/GetUploadDetailTask.java b/src/main/java/uk/ac/ebi/pride/gui/task/GetUploadDetailTask.java
@@ -1,9 +1,6 @@
 package uk.ac.ebi.pride.gui.task;
 
-import org.apache.http.HttpHost;
-import org.apache.http.conn.params.ConnRoutePNames;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 import uk.ac.ebi.pride.App;
 import uk.ac.ebi.pride.archive.submission.model.submission.UploadDetail;
@@ -12,6 +9,8 @@
 import uk.ac.ebi.pride.toolsuite.gui.task.TaskAdapter;
 import uk.ac.ebi.pride.web.util.template.SecureRestTemplateFactory;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.Properties;
 
 /**
@@ -49,10 +48,9 @@ protected UploadDetail doInBackground() throws Exception {
             String proxyPort = props.getProperty("http.proxyPort");
 
             if (proxyHost != null && proxyPort != null) {
-                HttpComponentsClientHttpRequestFactory factory = ((HttpComponentsClientHttpRequestFactory) restTemplate.getRequestFactory());
-                DefaultHttpClient defaultHttpClient = (DefaultHttpClient) factory.getHttpClient();
-                HttpHost proxy = new HttpHost(proxyHost.trim(), Integer.parseInt(proxyPort));
-                defaultHttpClient.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
+                Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
+                SimpleClientHttpRequestFactory requestFactory = (SimpleClientHttpRequestFactory) restTemplate.getRequestFactory();
+                requestFactory.setProxy(proxy);
             }
             uploadDetail = restTemplate.getForObject(baseUrl, UploadDetail.class, method.getMethod());
         } catch(Exception ex){

diff --git a/src/main/java/uk/ac/ebi/pride/gui/util/UpdateChecker.java b/src/main/java/uk/ac/ebi/pride/gui/util/UpdateChecker.java
@@ -29,6 +29,10 @@ public class UpdateChecker {
 
     private final String updateUrl;
 
+    private static String toolCurrentVersion;
+    private static String latestOrHigherVersion;
+
+
     public UpdateChecker(String updateUrl) {
         this.updateUrl = updateUrl;
     }
@@ -39,6 +43,7 @@ public UpdateChecker(String updateUrl) {
      * @return boolean return true if there is a new update.
      */
     public boolean hasUpdate(String currentVersion) {
+        toolCurrentVersion = currentVersion;
         boolean toUpdate = false;
         BufferedReader reader = null;
         try {
@@ -53,8 +58,9 @@ public boolean hasUpdate(String currentVersion) {
                     if (matcher.matches()) {
                         String version = matcher.group(1);
                         if (isHigherVersion(currentVersion, version)) {
+                            latestOrHigherVersion = version;
+                            currentVersion = version;
                             toUpdate = true;
-                            break;
                         }
                     }
                 }
@@ -94,12 +100,20 @@ private boolean isHigherVersion(String currentVersion, String version) {
      */
     public static void showUpdateDialog() {
         int option = JOptionPane.showConfirmDialog(null, "<html><b>A new version of ProteomeXchange submission tool is available</b>.<br><br> " +
-                "Would you like to update?</html>", "Update Info", JOptionPane.YES_NO_OPTION);
+                "Please download latest version by clicking yes </html>", "Update Info", JOptionPane.YES_NO_OPTION);
 
         if (option == JOptionPane.YES_OPTION) {
             DesktopContext context = Desktop.getInstance().getDesktopContext();
             String website = context.getProperty("px.submission.tool.url");
             HttpUtil.openURL(website);
         }
+
+        String latestOrHigherVersionParts[] = latestOrHigherVersion.split("\\.");
+        String toolCurrentVersionParts[] = toolCurrentVersion.split("\\.");
+
+        if (Integer.parseInt(latestOrHigherVersionParts[0]) > Integer.parseInt(toolCurrentVersionParts[0])
+                || Integer.parseInt(latestOrHigherVersionParts[1]) > Integer.parseInt(toolCurrentVersionParts[1])) {
+            System.exit(0);
+        }
     }
 }