Add model-loader integration tests

[aai/model-loader.git] / src / main / java / org / onap / aai / modelloader / restclient / AaiRestClient.java

diff --git a/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java b/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java
index 29c0c70..45f84d6 100644 (file)
--- a/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java
+++ b/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java
@@ -42,6 +42,7 @@ import org.onap.aai.modelloader.service.ModelLoaderMsgs;
 import org.onap.aai.restclient.client.OperationResult;
 import org.onap.aai.restclient.client.RestClient;
 import org.onap.aai.restclient.enums.RestAuthenticationMode;
+import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -52,6 +53,7 @@ import org.xml.sax.SAXException;
  * Wrapper around the standard A&AI Rest Client interface. This currently uses Jersey client 1.x
  *
  */
+@Component
 public class AaiRestClient {
 
     public static final String HEADER_TRANS_ID = "X-TransactionId";
@@ -156,24 +158,19 @@ public class AaiRestClient {
 
     private RestClient setupClient() {
         RestClient restClient = new RestClient();
+        restClient.validateServerHostname(false)
+                .validateServerCertChain(false)
+                .connectTimeoutMs(config.getClientConnectTimeoutMs())
+                .readTimeoutMs(config.getClientReadTimeoutMs());
 
         //Use certs only if SSL is enabled
         if (config.useHttpsWithAAI())
         {// @formatter:off
-            restClient.validateServerHostname(false)
-                    .validateServerCertChain(false)
-                    .clientCertFile(config.getAaiKeyStorePath())
-                    .clientCertPassword(config.getAaiKeyStorePassword())
-                    .connectTimeoutMs(120000)
-                    .readTimeoutMs(120000);
+            restClient
+                .clientCertFile(config.getAaiKeyStorePath())
+                .clientCertPassword(config.getAaiKeyStorePassword());
             // @formatter:on
         }
-        else {
-            restClient.validateServerHostname(false)
-                    .validateServerCertChain(false)
-                    .connectTimeoutMs(120000)
-                    .readTimeoutMs(120000);
-        }
 
         if (useBasicAuth()) {
             restClient.authenticationMode(RestAuthenticationMode.SSL_BASIC);