diff --git a/src/main/java/ru/nbch/credit_tracker/component/MonitoringRequestValidator.java b/src/main/java/ru/nbch/credit_tracker/component/MonitoringRequestValidator.java index e48ba48..d04fee8 100644 --- a/src/main/java/ru/nbch/credit_tracker/component/MonitoringRequestValidator.java +++ b/src/main/java/ru/nbch/credit_tracker/component/MonitoringRequestValidator.java @@ -1,12 +1,5 @@ package ru.nbch.credit_tracker.component; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Optional; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; @@ -18,8 +11,17 @@ import ru.nbch.credit_tracker.exceptions.SignalException; import ru.nbch.credit_tracker.model.MonitoringValidationError; import ru.nbch.credit_tracker.model.ValidationResult; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; -import ru.nbch.credit_tracker.utils.ValidationUtil; +import ru.nbch.credit_tracker.utils.ValidationService; import ru.nbch.credit_tracker.utils.ZipUtils; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Optional; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + import static ru.nbch.credit_tracker.utils.error.ExceptionUtils.clientExcp; import static ru.nbch.credit_tracker.utils.error.ExceptionUtils.serverExcp; @@ -27,11 +29,14 @@ import static ru.nbch.credit_tracker.utils.error.ExceptionUtils.serverExcp; @Slf4j public class MonitoringRequestValidator { private final CreditTrackerSettings config; + private final ValidationService validationService; private final StaxXmlProcessor staxXmlProcessor; public MonitoringRequestValidator(CreditTrackerSettings config, + ValidationService validationService, StaxXmlProcessor staxXmlProcessor) { this.config = config; + this.validationService = validationService; this.staxXmlProcessor = staxXmlProcessor; } @@ -64,7 +69,7 @@ public class MonitoringRequestValidator { staxXmlProcessor.read(in, MonitoringRequest.class, request -> { try { - ValidationUtil.validateMonitoringRequest(request); + validationService.validateMonitoringRequest(request); if (request.getPackageName() != null && validationResult.getPackageName() == null) { validationResult.setPackageName(request.getPackageName()); } diff --git a/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java index 61dc0bb..400ca07 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java +++ b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.config.settings.DataSourceSettings;