http: timeout config value with 30s default value

Author: MykolaGolubyev

webtau-config/src/main/java/org/testingisdocumenting/webtau/cfg/WebTauConfig.java

@@ -60,6 +60,9 @@ public class WebTauConfig {
             "max number of lines to display in console for outputs (e.g. http response)", () -> 500);
 
     private final ConfigValue waitTimeout = declare("waitTimeout", "wait timeout in milliseconds", () -> SystemTimerConfig.DEFAULT_WAIT_TIMEOUT);
+
+    private final ConfigValue httpTimeout = declare("httpTimeout", "http connect and read timeout in milliseconds", () -> 30000);
+
     private final ConfigValue disableFollowingRedirects = declareBoolean("disableRedirects", "disable following of redirects from HTTP calls", false);
     private final ConfigValue maxRedirects = declare("maxRedirects", "Maximum number of redirects to follow for an HTTP call", () -> 20);
     private final ConfigValue userAgent = declare("userAgent", "User agent to send on HTTP requests",
@@ -201,10 +204,14 @@ public ConfigValue getBaseUrlConfigValue() {
         return url;
     }
 
-    public int waitTimeout() {
+    public int getWaitTimeout() {
         return waitTimeout.getAsInt();
     }
 
+    public int getHttpTimeout() {
+        return httpTimeout.getAsInt();
+    }
+
     public boolean shouldFollowRedirects() {
         return !disableFollowingRedirects.getAsBoolean();
     }

webtau-config/src/main/java/org/testingisdocumenting/webtau/cfg/WebTauCoreConfigHandler.java

@@ -35,7 +35,7 @@
 public class WebTauCoreConfigHandler implements WebTauConfigHandler {
     @Override
     public void onAfterCreate(WebTauConfig cfg) {
-        SystemTimerConfig.setWaitTimeout(cfg.waitTimeout());
+        SystemTimerConfig.setWaitTimeout(cfg.getWaitTimeout());
         DocumentationArtifactsLocation.setRoot(cfg.getDocArtifactsPath());
     }
 }

webtau-http/src/main/java/org/testingisdocumenting/webtau/http/Http.java

@@ -887,7 +887,6 @@ public HttpResponse putToFullUrl(String fullUrl, HttpHeader requestHeader, HttpR
         return request("PUT", fullUrl, requestHeader, requestBody);
     }
 
-    @SuppressWarnings("unchecked")
     private <R> R executeAndValidateHttpCall(String requestMethod,
                                              String url,
                                              HttpCall httpCall,
@@ -902,7 +901,7 @@ private <R> R executeAndValidateHttpCall(String requestMethod,
 
         WebTauStep step = createHttpStep(validationResult, httpCall, validator);
         try {
-            return (R) step.execute(StepReportOptions.REPORT_ALL);
+            return step.execute(StepReportOptions.REPORT_ALL);
         } finally {
             lastValidationResult.set(validationResult);
             step.addPayload(validationResult);
@@ -967,7 +966,7 @@ private HttpResponse followRedirects(String requestMethod, HttpCall httpCall, Ht
         int retryCount = 0;
         while (response.isRedirect() && getCfg().shouldFollowRedirects() && retryCount++ < getCfg().maxRedirects()) {
             WebTauStep httpStep = createRedirectStep(requestMethod, response.locationHeader(), httpCall, fullRequestHeader);
-            response = (HttpResponse) httpStep.execute(StepReportOptions.REPORT_ALL);
+            response = httpStep.execute(StepReportOptions.REPORT_ALL);
         }
         return response;
     }
@@ -1161,6 +1160,8 @@ private HttpResponse request(String method, String fullUrl,
             HttpURLConnection connection = (HttpURLConnection) new URL(fullUrl).openConnection();
             connection.setInstanceFollowRedirects(false);
             setRequestMethod(method, connection);
+            connection.setConnectTimeout(getCfg().getHttpTimeout());
+            connection.setReadTimeout(getCfg().getHttpTimeout());
             connection.setRequestProperty("Content-Type", requestBody.type());
             connection.setRequestProperty("Accept", requestBody.type());
             connection.setRequestProperty("User-Agent", getCfg().getUserAgent());