From 0e9deb8ab0c8e89f57947f6fd32a99aaed63de6d Mon Sep 17 00:00:00 2001 From: ialbert Date: Mon, 20 Apr 2026 17:20:09 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-961 --- .../ru/spcex/clearing/csv/importer/component/FileService.java | 2 +- .../csv/importer/component/tro/processor/TroProcessor.java | 4 +--- .../spcex/clearing/csv/importer/service/SOrdersScheduler.java | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/FileService.java b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/FileService.java index de97ccfea..024be9a4d 100644 --- a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/FileService.java +++ b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/FileService.java @@ -58,7 +58,7 @@ public class FileService { public static void checkDir(Path dir) { if (!dir.toFile().exists() || !dir.toFile().isDirectory()) { - throw new IllegalStateException("directory " + dir + " is not a directory"); + throw new IllegalStateException("'" + dir + "' is not a directory"); } } } diff --git a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/tro/processor/TroProcessor.java b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/tro/processor/TroProcessor.java index c39c9ceaa..849d35ff0 100644 --- a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/tro/processor/TroProcessor.java +++ b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/tro/processor/TroProcessor.java @@ -25,7 +25,6 @@ public class TroProcessor { while ((line = reader.readLine()) != null) { lineNumber++; - // быстрый skip пустых строк if (line.isBlank()) { continue; } @@ -35,8 +34,7 @@ public class TroProcessor { result.add(parsed); } catch (Exception e) { throw new RuntimeException( - "Failed to parse TRO line " + lineNumber + ": " + line, - e + "Failed to parse TRO line " + lineNumber + ": " + line, e ); } } diff --git a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/service/SOrdersScheduler.java b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/service/SOrdersScheduler.java index 908982efc..88f66e8d6 100644 --- a/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/service/SOrdersScheduler.java +++ b/clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/service/SOrdersScheduler.java @@ -11,6 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import ru.clearing.classes.statics.data.misc.SOrders; import ru.spcex.clearing.csv.importer.component.FileService; +import static ru.spcex.clearing.csv.importer.component.FileService.checkDir; import ru.spcex.clearing.csv.importer.component.tro.data.SOrder; import ru.spcex.clearing.csv.importer.component.tro.parser.TroParserType; import ru.spcex.clearing.csv.importer.component.tro.processor.TroProcessor; @@ -38,6 +39,7 @@ public class SOrdersScheduler { @Autowired public SOrdersScheduler(CsvImporterSettings settings, FileService fileService, TroProcessorProvider provider, ImdgProvider imdgProvider, KafkaSender kafkaSender) { this.importDir = Path.of(settings.getSrcDir()); + checkDir(importDir); this.fileService = fileService; this.processor = provider.createProcessor(TroParserType.SOrder, SOrder.class); this.sOrderImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SOrders, SOrders.class);