diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java index 2c029714d..44ff27a04 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/validation/CompanyValidationConfig.java @@ -1,10 +1,20 @@ package ru.spcex.clearing.company.config.validation; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Function; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.clearing.classes.statics.data.company.Company; -import ru.clearing.platform.dictionary.*; +import ru.clearing.platform.dictionary.AllowedDictionary; +import ru.clearing.platform.dictionary.CompanySymbolDictionary; +import ru.clearing.platform.dictionary.CorporationSoleTypeDictionary; +import ru.clearing.platform.dictionary.CountryCodeDictionary; +import ru.clearing.platform.dictionary.LegalKindDictionary; +import ru.clearing.platform.dictionary.OrganizationTypeDictionary; +import ru.clearing.platform.dictionary.ResidenceDictionary; +import ru.clearing.platform.dictionary.WorkflowStatusDictionary; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.company.validation.CompanySymbolNotExistRule; import ru.spcex.clearing.imdg.IMDGDistributedNames; @@ -12,7 +22,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteReques import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest; import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyNewRequest; import ru.spcex.clearing.validation.common.rules.DictionaryPresentRule; -import ru.spcex.clearing.validation.common.rules.EnumPresentRule; import ru.spcex.clearing.validation.common.rules.FieldRequiredRule; import ru.spcex.clearing.validation.common.rules.IdPresentRule; import ru.spcex.clearing.validation.common.rules.specific.IdPresentSpecificRule; @@ -24,10 +33,6 @@ import ru.spcex.platform.utils.enumeration.EnumMessage; import ru.spcex.platform.utils.validation.IValidator; import ru.spcex.platform.utils.validation.ValidatorImpl; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Function; - @Configuration public class CompanyValidationConfig { @@ -182,8 +187,8 @@ public class CompanyValidationConfig { false), DictionaryPresentRule.instance("residence", CompanyInfoUpdateRequest::getResidence, - IMDGDistributedNames.Map_CountryCodeDictionary, - CountryCodeDictionary.class, + IMDGDistributedNames.Map_ResidenceDictionary, + ResidenceDictionary.class, CompanyErrors.RequiredFieldEmpty, CompanyErrors.DictionaryNotFound, false)