Merge branch 'release-1.3.0'

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>ubc.pavlab</groupId>
     <artifactId>rdp</artifactId>
-    <version>1.2.10</version>
+    <version>1.3.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/ubc/pavlab/rdp/services/RemoteResourceServiceImpl.java

@@ -18,6 +18,7 @@
 import ubc.pavlab.rdp.repositories.RoleRepository;
 import ubc.pavlab.rdp.settings.ApplicationSettings;
 
+import javax.ws.rs.client.Client;
 import javax.ws.rs.core.Response;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -117,7 +118,23 @@ private <T> Collection<T> getRemoteEntities( Class<T[]> arrCls, String uri, Map<
     }
 
     private <T> T remoteRequest( Class<T> cls, String remoteUrl, Map<String, String> args ) throws RemoteException {
-        ResteasyClient client = new ResteasyClientBuilder().build();
+
+        String proxyHost = applicationSettings.getIsearch().getHost();
+        String proxyPort = applicationSettings.getIsearch().getPort();
+        ResteasyClient client = null;
+
+        if (proxyHost != null && proxyPort != null &&
+                !proxyHost.equals("") && !proxyPort.equals("") ) {
+            client = new ResteasyClientBuilder().defaultProxy(
+                    proxyHost,
+                    Integer.parseInt( proxyPort )
+            ).build();
+            log.info( "Using " +proxyHost + ":" + proxyPort+ " as proxy for rest client." );
+        } else {
+            client = new ResteasyClientBuilder().build();
+            log.info( "Using default proxy for rest client." );
+        }
+
         ResteasyWebTarget target = client.target( remoteUrl + encodeParams( args ) );
         Response response = target.request().get();
         if ( response.getStatus() != 200 ) {

src/main/java/ubc/pavlab/rdp/settings/ApplicationSettings.java

@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.URL;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import ubc.pavlab.rdp.services.UserService;
@@ -53,6 +54,9 @@ public static class InternationalSearchSettings {
         private String[] apis;
         private List<String> authTokens;
         private String searchToken;
+        @URL
+        private String host = null;
+        private String port = null;
     }
 
     private InternationalSearchSettings isearch;
@@ -61,4 +65,13 @@ public static class InternationalSearchSettings {
     private boolean sendEmailOnRegistration;
     private int goTermSizeLimit = 100;
 
+//    @Getter
+//    @Setter
+//    public static class ProxySettings {
+//        @URL
+//        private String host = null;
+//        private String port = null;
+//    }
+//    private ProxySettings proxy;
+
 }

src/main/java/ubc/pavlab/rdp/settings/SiteSettings.java

@@ -48,4 +48,8 @@ public String getFullUrl() {
         return host + context + (context.endsWith( "/" ) ? "" : "/");
     }
 
+    @URL
+    private String proxyHost;
+    private String proxyPort;
+
 }