From f99398ea12e084227af3d5bc94008f5e913d9249 Mon Sep 17 00:00:00 2001 From: aalehin Date: Tue, 30 May 2023 18:08:29 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-316 --- fix up --- .../clearing/swt/importer/logic/stages/ImportToDB.java | 6 ++---- .../java/ru/spcex/clearing/swt/importer/util/SWTReader.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/ImportToDB.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/ImportToDB.java index af31235ca..c9ce3794a 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/ImportToDB.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/logic/stages/ImportToDB.java @@ -45,7 +45,7 @@ public class ImportToDB extends Stage { Charset sourceCharset = Charset.forName(settings.getCommon().getEncodingSource()); try (InputStream is = new ByteArrayInputStream(source); - SWTReader swtReader = new SWTReader(is, sourceCharset, resultContainer)) { + SWTReader swtReader = new SWTReader(is, sourceCharset, resultContainer)) { AbstractTable table = mappingEnumTableObjectTable.get(currTable); table.setHazelcastService(hazelcastService); table.setFilename(resultContainer.getSwtFile().getName()); @@ -60,9 +60,7 @@ public class ImportToDB extends Stage { log.warn("record index {} null", counter); continue; } - if (entity.length > 0) { - table.injectEntity(table.getEntity(swtHeaderData, entity)); - } + table.injectEntity(table.getEntity(swtHeaderData, entity)); } kafkaMessenger.notifySystemIfNeeded(currTable, fileId); } catch (IOException exception) { diff --git a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java index 87f95c629..b650e196c 100644 --- a/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java +++ b/clearing-parent/swt-importer/src/main/java/ru/spcex/clearing/swt/importer/util/SWTReader.java @@ -108,12 +108,12 @@ S_DF_13 String line = scanner.nextLine(); String[] separetedLine = line.split(":"); if (separetedLine.length < 5) { - return new String[0]; + return null; } return separetedLine; case S_DF_13: default: - return new String[0]; + return null; } }