diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/config/settings/ExportXMLServiceSettings.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/config/settings/ExportXMLServiceSettings.java index 52ac3bca9..eaf22daeb 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/config/settings/ExportXMLServiceSettings.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/config/settings/ExportXMLServiceSettings.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.xml.exporter.config.settings; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings; @@ -11,13 +12,21 @@ import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; @PropertySource("file:${spring.config.location}/application.properties") @ConfigurationProperties("export-xml-service") public class ExportXMLServiceSettings { + @NestedConfigurationProperty private HazelcastClientParams hazelcast; + @NestedConfigurationProperty private KafkaConsumerSettings kafkaConsumer; + @NestedConfigurationProperty private KafkaProducerSettings kafkaProducer; + @NestedConfigurationProperty private Common common; + @NestedConfigurationProperty private Store store; + @NestedConfigurationProperty private Cron cron; + private String section; + public HazelcastClientParams getHazelcast() { return hazelcast; } @@ -65,4 +74,12 @@ public class ExportXMLServiceSettings { public void setKafkaProducer(KafkaProducerSettings kafkaProducer) { this.kafkaProducer = kafkaProducer; } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } } diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/ResultContainer.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/ResultContainer.java index b2b3a92b6..a8a84c88a 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/ResultContainer.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/ResultContainer.java @@ -17,10 +17,12 @@ public class ResultContainer { private LocalDateTime registrationDateTime; private String memberCode; private DocumentTag documentTag; + private String section; - public ResultContainer(Table tableForExport) { + public ResultContainer(Table tableForExport, String section) { this.tableForExport = tableForExport; this.uuid = UUID.randomUUID(); + this.section = section; } public Table getTableForExport() { @@ -94,4 +96,12 @@ public class ResultContainer { public void setDocumentTag(DocumentTag documentTag) { this.documentTag = documentTag; } + + public String getSection() { + return section; + } + + public void setSection(String section) { + this.section = section; + } } diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/enums/FilenameTemplate.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/enums/FilenameTemplate.java index 58f406480..7d415ea43 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/enums/FilenameTemplate.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/enums/FilenameTemplate.java @@ -1,6 +1,5 @@ package ru.spcex.clearing.xml.exporter.logic.data.enums; -import static ru.spcex.clearing.xml.exporter.logic.stages.PrepareXMLFile.SECTION; import static ru.spcex.clearing.xml.exporter.logic.stages.PrepareXMLFile.outDir; import java.io.File; @@ -46,7 +45,7 @@ public enum FilenameTemplate { name.substring(i); } }, - df_section_dateTime_counter_mamberCode { + df_section_dateTime_counter_memberCode { @Override public String getFileName(ResultContainer resultContainer, List files) { return appendSection(resultContainer) @@ -63,7 +62,7 @@ public enum FilenameTemplate { result.append(File.separator); result.append(resultContainer.getTableForExport().getFilePrefix().toUpperCase(Locale.ROOT)); result.append('_'); - result.append(SECTION); + result.append(resultContainer.getSection()); return result; } diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java index 09601c0c8..a1205180d 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java @@ -25,7 +25,6 @@ import ru.spcex.clearing.xml.exporter.logic.data.enums.Table; @Component public class PrepareXMLFile implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); - public static final String SECTION = "S"; private final ExportXMLServiceSettings settings; public static String outDir; private final SFTPConfig.XmlGateway gateway; @@ -83,12 +82,12 @@ public class PrepareXMLFile implements InitializingBean { private static final Map nameTemplates = new EnumMap<>(Table.class); static { - nameTemplates.put(Table.S_DF02, FilenameTemplate.df_section_sameName); + nameTemplates.put(Table.S_DF02, FilenameTemplate.df_section_dateTime_counter); // df_section_sameName nameTemplates.put(Table.S_DF03, FilenameTemplate.df_section_dateTime_counter); - nameTemplates.put(Table.S_DF05, FilenameTemplate.df_section_dateTime); - nameTemplates.put(Table.S_DF07, FilenameTemplate.df_section_sameName); + nameTemplates.put(Table.S_DF05, FilenameTemplate.df_section_dateTime_counter); // df_section_dateTime + nameTemplates.put(Table.S_DF07, FilenameTemplate.df_section_dateTime_counter); // df_section_sameName nameTemplates.put(Table.S_DF51, FilenameTemplate.df_section_dateTime_counter); - nameTemplates.put(Table.S_DF53, FilenameTemplate.df_section_sameName); + nameTemplates.put(Table.S_DF53, FilenameTemplate.df_section_dateTime_counter); // df_section_sameName nameTemplates.put(Table.S_DF54, FilenameTemplate.df_section_dateTime_counter); nameTemplates.put(Table.S_DF56, FilenameTemplate.df_section_dateTime_counter); } diff --git a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/services/CommandService.java b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/services/CommandService.java index 5c3f8ef62..76e29bb98 100644 --- a/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/services/CommandService.java +++ b/clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/services/CommandService.java @@ -6,6 +6,7 @@ import org.apache.kafka.clients.consumer.Consumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.StopWatch; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; @@ -31,17 +32,20 @@ public class CommandService extends QueueConsumer implements InitializingBean { private final ExportFromHazelcast exportFromHazelcast; private final WriteXMLFile writeXMLFile; private final Journal journal; + private final String section; public CommandService(Consumer kafkaQueue, PrepareXMLFile prepareXMLFile, ExportFromHazelcast exportFromHazelcast, WriteXMLFile writeXMLFile, - Journal journal) { + Journal journal, + @Value("${export-xml-service.section:S}") String section) { super(kafkaQueue); this.prepareXMLFile = prepareXMLFile; this.exportFromHazelcast = exportFromHazelcast; this.writeXMLFile = writeXMLFile; this.journal = journal; + this.section = section; } @Override @@ -88,7 +92,7 @@ public class CommandService extends QueueConsumer implements InitializingBean { if (tableForExport.isEmpty()) { throw new IllegalStateException(String.format("Unsupported table prefix: %s", request.getNameOfTable())); } - ResultContainer resultContainer = new ResultContainer(tableForExport.get()); + ResultContainer resultContainer = new ResultContainer(tableForExport.get(), section); resultContainer.setGroupId(request.getSdfGroupId()); resultContainer.setSourceName(request.getFileName()); runProcess(resultContainer); @@ -96,7 +100,7 @@ public class CommandService extends QueueConsumer implements InitializingBean { private void processSpecial(Table table, BaseRequest systemRequest) { SdfClearingRequest request = systemRequest.getRequestPayload(); - ResultContainer resultContainer = new ResultContainer(table); + ResultContainer resultContainer = new ResultContainer(table, section); resultContainer.setGroupId(request.getGroupId()); resultContainer.setSourceName(null); runProcess(resultContainer); @@ -105,7 +109,7 @@ public class CommandService extends QueueConsumer implements InitializingBean { private void processByLauncher(Table table, BaseRequest systemRequest) { LauncherCommandRequest request = systemRequest.getRequestPayload(); log.info("RequestId={}, LauncherCommandRequest task={}. Table {}", systemRequest.getId(), request.getTaskName(), table); - ResultContainer resultContainer = new ResultContainer(table); + ResultContainer resultContainer = new ResultContainer(table, section); resultContainer.setGroupId(null); resultContainer.setSourceName(null); runProcess(resultContainer); diff --git a/clearing-parent/xml-exporter/src/main/resources/application.properties b/clearing-parent/xml-exporter/src/main/resources/application.properties index 8501f4510..a8def90af 100644 --- a/clearing-parent/xml-exporter/src/main/resources/application.properties +++ b/clearing-parent/xml-exporter/src/main/resources/application.properties @@ -30,3 +30,5 @@ export-xml-service.kafka-producer.retries=0 export-xml-service.kafka-producer.batch-size=16384 export-xml-service.kafka-producer.linger-ms=1 export-xml-service.kafka-producer.buffer-memory=33554432 + +export-xml-service.section=S diff --git a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java index be0282fb5..c1ed724cc 100644 --- a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java +++ b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcastTest.java @@ -110,7 +110,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf02, SDf02.class); imdg.insert(expectedSDf02); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF02); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF02, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-02_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -152,7 +152,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf03, SDf03.class); imdg.insert(expectedSDf03); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF03); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF03, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-03_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -186,7 +186,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf05, SDf05.class); imdg.insert(expectedSDf05); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF05); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF05, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-05_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -220,7 +220,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf07, SDf07.class); imdg.insert(expectedSDf07); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF07); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF07, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-07_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -252,7 +252,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf51, SDf51.class); imdg.insert(expectedSDf51); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF51); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF51, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-51_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -279,7 +279,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf53, SDf53.class); imdg.insert(expectedSDf53); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF53); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF53, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-53_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -334,7 +334,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf54, SDf54.class); imdg.insert(expectedSDf54); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF54); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF54, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-54_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); @@ -387,7 +387,7 @@ class ExportFromHazelcastTest { Imdg imdg = hazelcastService.getImdg(IMDGDistributedNames.Map_SDf56, SDf56.class); imdg.insert(expectedSDf56); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF56); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF56, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-56_S_PRC1604240915_1.xml")); StageResult stageResult = exportFromHazelcast.process(actualResultContainer); diff --git a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/WriteXMLFileTest.java b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/WriteXMLFileTest.java index 457dfa6e3..71cdcf3d1 100644 --- a/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/WriteXMLFileTest.java +++ b/clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/WriteXMLFileTest.java @@ -99,7 +99,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF02); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF02, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-02_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -146,7 +146,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF03); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF03, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-03_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -184,7 +184,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF05); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF05, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-05_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -231,7 +231,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF07); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF07, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-07_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -268,7 +268,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF51); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF51, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-51_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -309,7 +309,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF53); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF53, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-53_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -374,7 +374,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF54); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF54, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-54_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); @@ -415,7 +415,7 @@ class WriteXMLFileTest { expectedDocumentTag.setParentDoc(expectedParentDocTag); expectedDocumentTag.setObjects(List.of(expectedObjectTag)); - ResultContainer actualResultContainer = new ResultContainer(Table.S_DF56); + ResultContainer actualResultContainer = new ResultContainer(Table.S_DF56, "S"); actualResultContainer.setFileForExport(new File("./src/test/resources/xml/DF-56_S_PRC1604240915_1.xml")); actualResultContainer.setDocumentTag(expectedDocumentTag); diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-02_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-02_S_PRC1604240915_1.xml index 090d5af81..f6173c6b4 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-02_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-02_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-03_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-03_S_PRC1604240915_1.xml index 565b4b9ec..222643ca5 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-03_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-03_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-05_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-05_S_PRC1604240915_1.xml index 84bc8c61c..88dc88539 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-05_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-05_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-07_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-07_S_PRC1604240915_1.xml index fc452f087..e1434de47 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-07_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-07_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-51_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-51_S_PRC1604240915_1.xml index 98aad253f..9d4012b21 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-51_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-51_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-53_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-53_S_PRC1604240915_1.xml index 42dfacf8d..62f94a3ec 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-53_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-53_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-54_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-54_S_PRC1604240915_1.xml index bda341726..04ad3f081 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-54_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-54_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - + diff --git a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-56_S_PRC1604240915_1.xml b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-56_S_PRC1604240915_1.xml index 091c8c513..49c829c14 100644 --- a/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-56_S_PRC1604240915_1.xml +++ b/clearing-parent/xml-exporter/src/test/resources/xml-original/DF-56_S_PRC1604240915_1.xml @@ -1,5 +1,5 @@ - +