add 90 second timeout, up version

transcom · Nov 30, 2023 · 62ddc6c · 62ddc6c
1 parent 62deba7
commit 62ddc6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.milmove.trdmlambda</groupId>
 	<artifactId>trdm-lambda</artifactId>
-	<version>0.4.1.6</version>
+	<version>0.4.1.7</version>
 	<name>trdm java spring interface</name>
 	<description>Project for deploying a Java RESTful interface for SOAP requests to TRDM.</description>
 	<properties>

diff --git a/src/main/java/com/milmove/trdmlambda/milmove/service/GetTableService.java b/src/main/java/com/milmove/trdmlambda/milmove/service/GetTableService.java
@@ -1,8 +1,6 @@
 package com.milmove.trdmlambda.milmove.service;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 import javax.xml.datatype.DatatypeConfigurationException;
@@ -13,6 +11,8 @@
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.milmove.trdmlambda.milmove.config.TrdmProps;
@@ -59,6 +59,14 @@ public class GetTableService {
 
     public GetTableService(TrdmProps trdmProps, ClientPasswordCallback clientPasswordCallback) {
         Client client = ClientProxy.getClient(returnTableWSSoapHttpPort);
+        // Set HTTP policy (Timeout)
+        HTTPConduit httpConduit = (HTTPConduit) client.getConduit();
+        HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+        // Doubling timeout from 30 -> 90
+        httpClientPolicy.setConnectionTimeout(90000);
+        httpClientPolicy.setReceiveTimeout(90000);
+        httpConduit.setClient(httpClientPolicy);
+
         new SHA512PolicyLoader(client.getBus());
         Map<String, Object> ctx = ((BindingProvider) returnTableWSSoapHttpPort).getRequestContext();
         ctx.put("ws-security.callback-handler", clientPasswordCallback);
@@ -106,7 +114,8 @@ private GetTableResponse createSoapRequest(GetTableRequest request)
         trdm.setPhysicalName(request.getPhysicalName());
         trdm.setReturnContent(Boolean.valueOf(request.isReturnContent()));
 
-        // Use this to set the data pull since time X so as to not always pull all data every request
+        // Use this to set the data pull since time X so as to not always pull all data
+        // every request
         trdm.setContentUpdatedSinceDateTime(DatatypeFactory.newInstance()
                 .newXMLGregorianCalendar(request.getContentUpdatedSinceDateTime()));
 
@@ -140,7 +149,7 @@ private GetTableResponse createSoapRequest(GetTableRequest request)
             // Set the columnFilters object to the trdm object
             trdm.setColumnFilters(columnFilters);
         }
-        
+
         // Check optional field
         if (request.isReturnContent()) {
             trdm.setReturnRowStatus(Boolean.valueOf(request.isReturnContent()));