diff --git a/clearing-parent/clearing-utils/pom.xml b/clearing-parent/clearing-validation/pom.xml
similarity index 95%
rename from clearing-parent/clearing-utils/pom.xml
rename to clearing-parent/clearing-validation/pom.xml
index 580382cc7..60ad3b00b 100644
--- a/clearing-parent/clearing-utils/pom.xml
+++ b/clearing-parent/clearing-validation/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- clearing-utils
- clearing-utils
+ clearing-validation
+ clearing-validation
Clearing-module, dependency version of platform-utils
jar
SPCEX-1.0.0.0
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/package-info.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/package-info.java
similarity index 97%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/package-info.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/package-info.java
index 636322526..4077b07c4 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/package-info.java
+++ b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/package-info.java
@@ -1,4 +1,4 @@
-/**
- * Утилиты с зависимостями от множества модулей clearing-*
- */
+/**
+ * Утилиты с зависимостями от множества модулей clearing-*
+ */
package ru.spcex.clearing.util;
\ No newline at end of file
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java
similarity index 97%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java
index 0f08fe624..f8aef7bf6 100644
--- a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java
+++ b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/exchangers/BiDirectionQueueExchanger.java
@@ -1,66 +1,66 @@
-package ru.spcex.clearing.util.services.exchangers;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-
-/**
- * Синхронный обмен сообщениями с ассинхронным сервисом.
- * Метод exchange() отправляет сообщение в очередь и дожидается ответа из другой очереди
- */
-public class BiDirectionQueueExchanger> extends QueueConsumer implements InitializingBean, DisposableBean {
- protected final Logger log = LoggerFactory.getLogger(getClass());
- protected final Object sync = new Object();
- protected String outQueue;
- protected String inQueue;
- protected Class listenClass;
- protected long timeout;
-
- /**
- * Синхронно-ассинхронный обмен сообщениями
- *
- * @param kafkaQueue
- * @param kafkaProducer
- * @param outQueue отправляет в очередь
- * @param inQueue слушает очередь, ожидает ответов
- * @param listenClass типы объектов из inQueue
- * @param timeout - максимальное ожидание ответа, в миллисекундах, 0 - неограничено
- */
- public BiDirectionQueueExchanger(Consumer kafkaQueue, Producer kafkaProducer,
- String outQueue,
- String inQueue, Class listenClass,
- long timeout) {
- super(kafkaQueue, kafkaProducer);
- this.outQueue = outQueue;
- this.inQueue = inQueue;
- this.listenClass = listenClass;
- this.timeout = timeout;
- }
-
- /**
- * Отправить сообщение message в outQueue и дождаться ответа из очереди inQueue
- *
- * @param message
- * @return
- * @throws InterruptedException
- */
- public TOut exchange(TIn message) throws InterruptedException {
- //todo impl BiDirectionQueueExchanger
- return null;
- }
-
- @Override
- public void destroy() throws Exception {
- log.debug("Listener {} for async exchange {}-{} close", this, outQueue, inQueue);
- }
-
- @Override
- public void afterPropertiesSet() throws Exception {
- log.debug("Listener {} for async exchange {}-{} ready", this, outQueue, inQueue);
- }
-}
+package ru.spcex.clearing.util.services.exchangers;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+
+/**
+ * Синхронный обмен сообщениями с ассинхронным сервисом.
+ * Метод exchange() отправляет сообщение в очередь и дожидается ответа из другой очереди
+ */
+public class BiDirectionQueueExchanger> extends QueueConsumer implements InitializingBean, DisposableBean {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+ protected final Object sync = new Object();
+ protected String outQueue;
+ protected String inQueue;
+ protected Class listenClass;
+ protected long timeout;
+
+ /**
+ * Синхронно-ассинхронный обмен сообщениями
+ *
+ * @param kafkaQueue
+ * @param kafkaProducer
+ * @param outQueue отправляет в очередь
+ * @param inQueue слушает очередь, ожидает ответов
+ * @param listenClass типы объектов из inQueue
+ * @param timeout - максимальное ожидание ответа, в миллисекундах, 0 - неограничено
+ */
+ public BiDirectionQueueExchanger(Consumer kafkaQueue, Producer kafkaProducer,
+ String outQueue,
+ String inQueue, Class listenClass,
+ long timeout) {
+ super(kafkaQueue, kafkaProducer);
+ this.outQueue = outQueue;
+ this.inQueue = inQueue;
+ this.listenClass = listenClass;
+ this.timeout = timeout;
+ }
+
+ /**
+ * Отправить сообщение message в outQueue и дождаться ответа из очереди inQueue
+ *
+ * @param message
+ * @return
+ * @throws InterruptedException
+ */
+ public TOut exchange(TIn message) throws InterruptedException {
+ //todo impl BiDirectionQueueExchanger
+ return null;
+ }
+
+ @Override
+ public void destroy() throws Exception {
+ log.debug("Listener {} for async exchange {}-{} close", this, outQueue, inQueue);
+ }
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ log.debug("Listener {} for async exchange {}-{} ready", this, outQueue, inQueue);
+ }
+}
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/ValidationHelper.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/ValidationHelper.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/ValidationHelper.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/ValidationHelper.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/DateNotBeforeRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/DictionaryPresentRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EndDtAfterStartDtRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/EnumPresentRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/IdPresentRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IsLongValueRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/IsLongValueRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/IsLongValueRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/IsLongValueRule.java
diff --git a/clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java b/clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java
similarity index 100%
rename from clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java
rename to clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/validation/common/rules/TimeNotBeforeRule.java
diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml
index 9913e8df4..ee17025df 100644
--- a/clearing-parent/company-service/pom.xml
+++ b/clearing-parent/company-service/pom.xml
@@ -38,7 +38,7 @@
ru.spcex.clearing
- clearing-utils
+ clearing-validation
org.springframework.boot
diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml
index e71a79d1a..7f495921e 100644
--- a/clearing-parent/pom.xml
+++ b/clearing-parent/pom.xml
@@ -21,7 +21,7 @@
backend-api
imdg
security-util
- clearing-utils
+ clearing-validation
db-scripts
dbf-importer
dbf-exporter
diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml
index 63e85f10a..ae27be76c 100644
--- a/clearing-parent/securities-service/pom.xml
+++ b/clearing-parent/securities-service/pom.xml
@@ -26,7 +26,7 @@
ru.spcex.clearing
- clearing-utils
+ clearing-validation
ru.spcex.platform
diff --git a/pom.xml b/pom.xml
index 6d9c0427c..b5e15a784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
ru.spcex.clearing
- clearing-utils
+ clearing-validation
${global.project.version}