fix: get connection timeout values from config

Author: stevecl5

common/src/main/java/com/mx/path/core/common/connect/ConnectionSettings.java

@@ -54,7 +54,7 @@ default void describe(ObjectMap description) {
   Duration getRequestTimeout();
 
   /**
-   * @return true, if host name should be checked against the certificate
+   * @return true if host name should NOT be checked against the certificate, false otherwise
    */
   boolean getSkipHostNameVerify();
 

common/src/main/java/com/mx/path/core/common/reflection/Fields.java

@@ -105,6 +105,10 @@ public static Object coerceValueType(Class<?> targetType, Object value) {
       return null;
     }
 
+    if (targetType == value.getClass()) {
+      return value;
+    }
+
     if (targetType == byte.class || targetType == Byte.class) {
       return coerceToByte(value);
     }

gateway/src/main/java/com/mx/path/gateway/configuration/ConnectionBinder.java

@@ -9,6 +9,7 @@
 import com.mx.path.core.common.collection.ObjectMap;
 import com.mx.path.core.common.connect.AccessorConnectionSettings;
 import com.mx.path.core.common.gateway.GatewayException;
+import com.mx.path.core.common.lang.Durations;
 import com.mx.path.core.common.lang.Strings;
 import com.mx.path.gateway.connect.filter.CallbacksFilter;
 import com.mx.path.gateway.connect.filter.ErrorHandlerFilter;
@@ -64,7 +65,15 @@ public static AccessorConnectionSettings buildConnection(ObjectMap map, String c
     if (passwordString != null) {
       connection.keystorePassword(passwordString.toCharArray());
     }
-    connection.skipHostNameVerify(Boolean.parseBoolean(String.valueOf(map.getMap(connectionName).get("skipHostNameVerify"))));
+    String connectTimeoutString = map.getMap(connectionName).getAsString("connectTimeout");
+    if (connectTimeoutString != null) {
+      connection.connectTimeout(Durations.fromCompactString(connectTimeoutString));
+    }
+    String requestTimeoutString = map.getMap(connectionName).getAsString("requestTimeout");
+    if (requestTimeoutString != null) {
+      connection.requestTimeout(Durations.fromCompactString(requestTimeoutString));
+    }
+    connection.skipHostNameVerify(map.getMap(connectionName).getAsBoolean("skipHostNameVerify", false));
 
     // Default request filters
     // todo: Provide way to configure the request filters in connection block

gateway/src/test/groovy/com/mx/path/gateway/configuration/ConnectionBinderTest.groovy

@@ -1,11 +1,15 @@
 package com.mx.path.gateway.configuration
 
+import java.time.Duration
+
 import com.mx.path.core.common.accessor.PathResponseStatus
 import com.mx.path.core.common.collection.ObjectMap
+import com.mx.path.core.common.configuration.ConfigurationException
 import com.mx.path.core.common.gateway.GatewayException
 import com.mx.testing.binding.ConnectionWithBoundConfiguration
 
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class ConnectionBinderTest extends Specification {
 
@@ -40,6 +44,9 @@ class ConnectionBinderTest extends Specification {
       certificateAlias == "alias"
       keystorePath == "path"
       keystorePassword.toString() == "password"
+      connectTimeout == null
+      requestTimeout == null
+      !skipHostNameVerify
     }
   }
 
@@ -73,6 +80,9 @@ class ConnectionBinderTest extends Specification {
         put("certificateAlias", "alias")
         put("keystorePath", "path")
         put("keystorePassword", "password")
+        put("connectTimeout", "500ms")
+        put("requestTimeout", "20s")
+        put("skipHostNameVerify", true)
       }
     }
 
@@ -85,7 +95,34 @@ class ConnectionBinderTest extends Specification {
       certificateAlias == "alias"
       keystorePath == "path"
       keystorePassword.toString() == "password"
+      connectTimeout == Duration.ofMillis(500)
+      requestTimeout == Duration.ofSeconds(20)
+      skipHostNameVerify
+    }
+  }
+
+  @Unroll
+  def "build connection throws on invalid #fieldName format"(String fieldName) {
+    given:
+    def configuration = new ObjectMap().tap {
+      createMap("TestConnection").tap {
+        put("baseUrl", "url")
+        put(fieldName, "not-a-valid-duration")
+      }
     }
+
+    when:
+    subject.buildConnection(configuration, "TestConnection")
+
+    then:
+    def e = thrown(ConfigurationException)
+    e.message == "Invalid duration string: not-a-valid-duration"
+
+    where:
+    fieldName << [
+      "connectTimeout",
+      "requestTimeout"
+    ]
   }
 
   def "build connection and fail validation"() {