From b3a3d57ee3e8442b982600b70a942fa6e808d3f3 Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 9 Jan 2026 23:41:19 +0700 Subject: [PATCH] NCBACK-3 --- .../nocopy/configuration/file/YandexConfig.java | 14 -------------- .../soune/nocopy/service/YandexSearchService.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 src/main/java/ru/soune/nocopy/configuration/file/YandexConfig.java diff --git a/src/main/java/ru/soune/nocopy/configuration/file/YandexConfig.java b/src/main/java/ru/soune/nocopy/configuration/file/YandexConfig.java deleted file mode 100644 index e9f1576..0000000 --- a/src/main/java/ru/soune/nocopy/configuration/file/YandexConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package ru.soune.nocopy.configuration.file; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@Configuration -@ConfigurationProperties(prefix = "yandex") -public class YandexConfig { - private String apiKey; - private String folderId; - private String searchUrl; -} \ No newline at end of file diff --git a/src/main/java/ru/soune/nocopy/service/YandexSearchService.java b/src/main/java/ru/soune/nocopy/service/YandexSearchService.java index 3fd8c60..6c3d32f 100644 --- a/src/main/java/ru/soune/nocopy/service/YandexSearchService.java +++ b/src/main/java/ru/soune/nocopy/service/YandexSearchService.java @@ -54,6 +54,7 @@ public class YandexSearchService { MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(), Map.of("fileId",fileId))); }); + byte[] fileBytes; if (!isImageFile(fileEntity)) { log.error("File not image: {}", fileEntity.getMimeType()); @@ -62,7 +63,14 @@ public class YandexSearchService { Map.of("file_type", fileEntity.getMimeType()))); } - byte[] fileBytes = readFileFromDisk(fileEntity); + try { + fileBytes = readFileFromDisk(fileEntity); + } catch (IOException e) { + throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007, + MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(), + Map.of("fileId", fileId, + "filePath", fileEntity.getFilePath()))); + } return callYandexApi(fileBytes); } @@ -99,7 +107,6 @@ public class YandexSearchService { connection.setRequestProperty("Authorization", "Api-Key " + apiKey); connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("Accept", "application/json"); -// connection.setRequestProperty("User-Agent", "Mozilla/5.0"); connection.setConnectTimeout(30000); connection.setReadTimeout(30000); connection.setDoOutput(true);