Merge pull request #6 from lfir/feat/separate-timeouts

Put Connect and Request timeouts in separate variables

Author: lfir

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.4</version>
+        <version>3.5.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cf.maybelambda</groupId>
     <artifactId>http-validator</artifactId>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
     <name>http-validator</name>
     <description>Retrieves target HTTP resources and responses, validates them and notifies about their current status.</description>
 
@@ -34,30 +34,30 @@
         <dependency>
             <groupId>org.springframework.restdocs</groupId>
             <artifactId>spring-restdocs-mockmvc</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.5</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.mailgun/mailgun-java -->
         <dependency>
             <groupId>com.mailgun</groupId>
             <artifactId>mailgun-java</artifactId>
-            <version>2.0.0</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
-            <version>0.12.6</version>
+            <version>0.13.0</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-impl</artifactId>
-            <version>0.12.6</version>
+            <version>0.13.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-jackson</artifactId>
-            <version>0.12.6</version>
+            <version>0.13.0</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@@ -142,7 +142,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.2</version>
+                <version>3.12.0</version>
                 <executions>
                     <execution>
                         <id>generate-javadoc</id>

src/main/java/cf/maybelambda/httpvalidator/springboot/service/ValidationService.java

@@ -48,7 +48,8 @@
 @Service
 public class ValidationService {
     public static final String HEADER_KEY_VALUE_DELIMITER = "|";
-    private final Duration TIMEOUT_SECONDS = Duration.ofSeconds(10);
+    private static final Duration CONNECT_TIMEOUT_SECONDS = Duration.ofSeconds(10);
+    private static final Duration REQUEST_TIMEOUT_SECONDS = Duration.ofSeconds(30);
     private Duration lrTimeElapsed;
     private String lrStartDateTime;
     private int[] lrTaskCounts;
@@ -69,7 +70,7 @@ public class ValidationService {
      */
     public ValidationService() {
         this.client = HttpClient.newBuilder()
-            .connectTimeout(TIMEOUT_SECONDS)
+            .connectTimeout(CONNECT_TIMEOUT_SECONDS)
             .followRedirects(HttpClient.Redirect.ALWAYS).build();
     }
 
@@ -121,7 +122,7 @@ List<HttpSendOutcomeWrapper> buildAndExecuteRequests(List<ValidationTask> tasks)
             HttpRequest.Builder req = HttpRequest.newBuilder();
             req.uri(URI.create(task.reqURL()));
             task.reqHeaders().forEach(h -> req.headers(h.split(Pattern.quote(HEADER_KEY_VALUE_DELIMITER))));
-            req.timeout(TIMEOUT_SECONDS);
+            req.timeout(REQUEST_TIMEOUT_SECONDS);
             if (POST.equals(task.reqMethod())) {
                 req.POST(ofString(this.mapper.writeValueAsString(task.reqBody())));
             }