Merge branch 'RM-3489_fix_apiclient_timeouts' into 'master'

RM-3489: Create workaround for bug in ApiClient. Calling ApiClient.setDebbugging(boolean) rebuilds httpclient and that invalidates previous httpclient properties set by ApiClient.setConnectTimeout(int).

See merge request cdoc2/cdoc2-java-ref-impl!26

Author: jann0k

cdoc2-cli/config/localhost/localhost_pkcs12.properties

@@ -7,7 +7,10 @@ cdoc2.client.server.id=localhost
 cdoc2.client.server.base-url.post=https://localhost:8443
 # Quering capsules requires mTLS
 cdoc2.client.server.base-url.get=https://localhost:8444
+
 cdoc2.client.server.debug=true
+cdoc2.client.server.connect-timeout=1000
+cdoc2.client.server.read-timeout=1000
 
 # trusted certificates by client
 cdoc2.client.ssl.trust-store.type=JKS

cdoc2-cli/pom.xml

@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>cdoc2-cli</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
     <description>Command line utility to create/process CDOC2 files</description>
 
     <properties>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>
             <artifactId>cdoc2-lib</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

cdoc2-client/pom.xml

@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>cdoc2-client</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
     <description>CDOC2 server client generation from openapi specification</description>
 
     <properties>

cdoc2-client/src/main/java/ee/cyber/cdoc2/client/Cdoc2KeyCapsuleApiClient.java

@@ -169,11 +169,19 @@ protected void customizeClientBuilder(ClientBuilder clientBuilder) {
                 }
             };
 
+            // BUG in openapi-generator ApiClient, {@link org.openapitools.client.ApiClient#setDebugging}
+            // overwrites already set httpclient properties, like setConnectTimeout()
+            // setDebugging must be called first, same with setClientConfig and other methods that
+            // call ApiClient#buildHttpClient()
+            apiClient.setDebugging(debug);
+
             apiClient.setBasePath(this.baseUrl);
+
+            log.debug("Setting connect timeout to {}", connectTimeoutMs);
             apiClient.setConnectTimeout(connectTimeoutMs);
+            log.debug("Setting read timeout to {}", readTimeoutMs);
             apiClient.setReadTimeout(readTimeoutMs);
 
-            apiClient.setDebugging(debug);
             apiClient.addDefaultHeader("Accept", "application/json");
             apiClient.selectHeaderAccept("application/json");
 

cdoc2-lib/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>cdoc2-lib</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
     <description>CDOC2 creation and processing library</description>
 
     <properties>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>ee.cyber.cdoc2</groupId>
             <artifactId>cdoc2-client</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>