#111 - config for timeout with high default value

avni/src/main/java/org/avni_integration_service/avni/client/AvniHttpClient.java

@@ -4,6 +4,7 @@
 import org.avni_integration_service.avni.domain.auth.IdpDetailsResponse;
 import org.avni_integration_service.util.ObjectJsonMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -20,6 +21,7 @@
 @Component
 public class AvniHttpClient {
     @Autowired
+    @Qualifier("AvniRestTemplate")
     private RestTemplate restTemplate;
 
     private static final Logger logger = Logger.getLogger(AvniHttpClient.class);

avni/src/main/java/org/avni_integration_service/avni/config/AvniBeanConfiguration.java

@@ -0,0 +1,32 @@
+package org.avni_integration_service.avni.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.web.client.RestTemplate;
+
+import java.time.Duration;
+
+@Configuration
+public class AvniBeanConfiguration {
+    private final RestTemplate restTemplate;
+
+    @Value("${avni.httpClient.timeout}")
+    private int avniHttpClientTimeout;
+
+    @Autowired
+    public AvniBeanConfiguration(Environment environment, RestTemplateBuilder restTemplateBuilder) {
+        Duration timeout = Duration.ofSeconds(avniHttpClientTimeout);
+        restTemplate = restTemplateBuilder.setConnectTimeout(timeout)
+                .setReadTimeout(timeout)
+                .build();
+    }
+
+    @Bean("AvniRestTemplate")
+    public RestTemplate avniRestTemplate() {
+        return restTemplate;
+    }
+}

avni/src/main/resources/avni-application.properties

@@ -5,3 +5,4 @@ avni.db.port=${AVNI_DB_PORT:5432}
 avni.impl_org.db.user=${AVNI_IMPL_DB_USER:dummy}
 avni.impl.user.id=${AVNI_IMPL_USER_ID:-1}
 app.config.tx.rollback=${AVNI_DB_TX_ROLLBACK:true}
+avni.httpClient.timeout=${AVNI_HTTP_CLIENT_TIMEOUT:120}

goonj/src/main/java/org/avni_integration_service/goonj/service/TokenService.java

@@ -4,6 +4,7 @@
 import org.avni_integration_service.goonj.config.GoonjConfig;
 import org.avni_integration_service.goonj.config.GoonjContextProvider;
 import org.avni_integration_service.goonj.domain.AuthResponse;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -33,7 +34,7 @@ public class TokenService {
     @Value("${goonj.sf.tokenExpiry}")
     private int tokenExpiry;
 
-    public TokenService(RestTemplate restTemplate, GoonjContextProvider goonjContextProvider) {
+    public TokenService(@Qualifier("UtilRestTemplate") RestTemplate restTemplate, GoonjContextProvider goonjContextProvider) {
         this.restTemplate = restTemplate;
         this.goonjContextProvider = goonjContextProvider;
     }

util/src/main/java/org/avni_integration_service/util/BeanConfiguration.java

@@ -1,6 +1,7 @@
 package org.avni_integration_service.util;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -12,19 +13,15 @@
 
 @Configuration
 public class BeanConfiguration {
-    private final RestTemplate restTemplate;
+    private final RestTemplate utilRestTemplate;
 
     @Autowired
     public BeanConfiguration(Environment environment, RestTemplateBuilder restTemplateBuilder) {
-        Duration timeout = Duration.ofSeconds(20);
-        restTemplate = restTemplateBuilder.setConnectTimeout(timeout)
-                .setReadTimeout(timeout)
-                .build();
+        utilRestTemplate = restTemplateBuilder.build();
     }
 
-    @Bean
-    @Primary
-    public RestTemplate restTemplate() {
-        return restTemplate;
+    @Bean("UtilRestTemplate")
+    public RestTemplate utilRestTemplate() {
+        return utilRestTemplate;
     }
 }

util/src/main/java/org/avni_integration_service/util/HealthCheckService.java

@@ -1,6 +1,7 @@
 package org.avni_integration_service.util;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
@@ -21,7 +22,7 @@ public class HealthCheckService {
     private String healthCheckPingKey;
 
     @Autowired
-    public HealthCheckService(RestTemplate restTemplate) {
+    public HealthCheckService(@Qualifier("UtilRestTemplate") RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }