From 294a2959db44f72a3e3bb6e4c71bb036655fcbc0 Mon Sep 17 00:00:00 2001
From: Artyom Hackimullin <xakimullin2@gmail.com>
Date: Tue, 28 Jan 2025 13:18:47 +0300
Subject: [PATCH] fix

---
 .../java/ervu/client/okopf/EsnsiOkopfClient.java    | 13 +++++++------
 config/micord.env                                   |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java b/backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
index 469c7561..3040b6fe 100644
--- a/backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
+++ b/backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
@@ -6,6 +6,7 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.zip.ZipInputStream;
@@ -28,10 +29,10 @@ public class EsnsiOkopfClient {
 
   @Value("${esnsi.okopf.url}")
   private String url;
-  @Value("${esnsi.okopf.connect.timeout:2000}")
-  private int connectTimeout;
-  @Value("${esnsi.okopf.read.timeout:4000}")
-  private int readTimeout;
+  @Value("${esnsi.okopf.connect.timeout:2}")
+  private long connectTimeout;
+  @Value("${esnsi.okopf.read.timeout:4}")
+  private long readTimeout;
 
   @Retryable(value = {IOException.class}, maxAttemptsExpression = "${esnsi.okopf.retry.max.attempts.load:3}", backoff =
   @Backoff(delayExpression = "${esnsi.okop.retry.delay.load:3000}"))
@@ -39,8 +40,8 @@ public class EsnsiOkopfClient {
     int retryCount = RetrySynchronizationManager.getContext().getRetryCount() + 1;
     LOGGER.info("Attempt #{} to load json okopf form data from URL: {}", retryCount, url);
     HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
-    connection.setConnectTimeout(connectTimeout);
-    connection.setReadTimeout(readTimeout);
+    connection.setConnectTimeout((int) Duration.ofSeconds(connectTimeout).getSeconds());
+    connection.setReadTimeout((int) Duration.ofSeconds(readTimeout).getSeconds());
     int statusCode = connection.getResponseCode();
     LOGGER.info("Connecting timeout set to {} ms, read timeout set to {}", connectTimeout, readTimeout);
     if (statusCode >= 200 && statusCode <= 202) {
diff --git a/config/micord.env b/config/micord.env
index 5b8796a2..f097e315 100644
--- a/config/micord.env
+++ b/config/micord.env
@@ -43,8 +43,8 @@ ESNSI_OKOPF_URL=https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/16271/file?ex
 ESNSI_OKOPF_CRON_LOAD=0 0 */1 * * *
 ESNSI_OKOPF_RETRY_MAX_ATTEMPTS_LOAD=3
 ESNSI_OKOPF_RETRY_DELAY_LOAD=3000
-ESNSI_OKOPF_CONNECT_TIMEOUT=2000
-ESNSI_OKOPF_READ_TIMEOUT=4000
+ESNSI_OKOPF_CONNECT_TIMEOUT=2
+ESNSI_OKOPF_READ_TIMEOUT=4
 
 ERVU_FILE_UPLOAD_MAX_FILE_SIZE=5242880
 ERVU_FILE_UPLOAD_MAX_REQUEST_SIZE=6291456