From 2c98ca87fa46851117c7c171c2a5e0c7a939b346 Mon Sep 17 00:00:00 2001 From: aalehin Date: Tue, 30 Aug 2022 18:53:18 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B5=D0=B9=D0=BC=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=D0=B0=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clearing-parent/backend-api/src/main/resources/meta.xml | 2 +- .../Company => statics/data/company}/Company.java | 4 ++-- .../Company => statics/data/company}/CompanyRoleSet.java | 2 +- .../Company => statics/data/company}/CompanySymbols.java | 2 +- .../Company => statics/data/company}/CompanyUpdate.java | 2 +- .../{StaticData/Misc => statics/data/misc}/KeyRate.java | 3 +-- .../Misc => statics/data/misc}/MoneyMarketSecurity.java | 2 +- .../Profile => statics/data/profile}/CompanyInfo.java | 2 +- .../Profile => statics/data/profile}/Contact.java | 2 +- .../Profile => statics/data/profile}/ProfileDocument.java | 2 +- .../User => statics/data/user}/ClearingUser.java | 2 +- .../clearing/imdg/businessevent/CompanyUpdateMapStore.java | 6 +++--- .../spcex/clearing/imdg/businessobject/CompanyMapStore.java | 4 ++-- .../spcex/clearing/imdg/object/CompanyRoleSetMapStore.java | 2 +- .../spcex/clearing/imdg/object/CompanySymbolsMapStore.java | 2 +- .../java/ru/spcex/clearing/imdg/object/ContactMapStore.java | 2 +- .../java/ru/spcex/clearing/imdg/object/KeyRateMapStore.java | 3 +-- .../clearing/imdg/object/MoneyMarketSecurityMapStore.java | 2 +- .../spcex/clearing/imdg/object/ProfileDocumentMapStore.java | 2 +- .../ru/spcex/clearing/imdg/services/UpdateMapService.java | 4 ++-- .../securities/service/cud/MoneyMarketSecurityService.java | 2 +- .../ru/spcex/clearing/utility/service/KeyRateService.java | 2 +- 22 files changed, 27 insertions(+), 29 deletions(-) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company => statics/data/company}/Company.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company => statics/data/company}/CompanyRoleSet.java (92%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company => statics/data/company}/CompanySymbols.java (94%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Company => statics/data/company}/CompanyUpdate.java (91%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Misc => statics/data/misc}/KeyRate.java (93%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Misc => statics/data/misc}/MoneyMarketSecurity.java (97%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Profile => statics/data/profile}/CompanyInfo.java (98%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Profile => statics/data/profile}/Contact.java (94%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/Profile => statics/data/profile}/ProfileDocument.java (97%) rename clearing-parent/classes/src/main/java/ru/clearing/classes/{StaticData/User => statics/data/user}/ClearingUser.java (92%) diff --git a/clearing-parent/backend-api/src/main/resources/meta.xml b/clearing-parent/backend-api/src/main/resources/meta.xml index 8c47e00a7..69aa21006 100644 --- a/clearing-parent/backend-api/src/main/resources/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta.xml @@ -253,7 +253,7 @@ - + diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java index 56ba80c6a..0acf9f092 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/Company.java @@ -1,7 +1,7 @@ -package ru.clearing.classes.StaticData.Company; +package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.StaticData.Profile.CompanyInfo; +import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.clearing.classes.objects.BusinessObject; import java.io.Serial; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyRoleSet.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyRoleSet.java index b2e5d0472..52dff6067 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyRoleSet.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Company; +package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbols.java similarity index 94% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbols.java index 43563f3a9..4ae40a8d0 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanySymbols.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Company; +package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyUpdate.java similarity index 91% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyUpdate.java index f022c7796..354b2feb6 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/company/CompanyUpdate.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Company; +package ru.clearing.classes.statics.data.company; import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/KeyRate.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java similarity index 93% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/KeyRate.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java index 61cf1fd3a..d107be73e 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/KeyRate.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java @@ -1,8 +1,7 @@ -package ru.clearing.classes.StaticData.Misc; +package ru.clearing.classes.statics.data.misc; import ru.spcex.platform.classes.base.SpcexObjectBase; -import java.math.BigDecimal; import java.time.Instant; /** diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/MoneyMarketSecurity.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java similarity index 97% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/MoneyMarketSecurity.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java index de1669439..feca98c31 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Misc/MoneyMarketSecurity.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MoneyMarketSecurity.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Misc; +package ru.clearing.classes.statics.data.misc; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java similarity index 98% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java index 5bc4eab1a..52f899e00 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/CompanyInfo.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Profile; +package ru.clearing.classes.statics.data.profile; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/Contact.java similarity index 94% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/Contact.java index 547e288ac..e2aeeeca1 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/Contact.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Profile; +package ru.clearing.classes.statics.data.profile; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java similarity index 97% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java index bb38c616c..043aa2d1d 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/profile/ProfileDocument.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.Profile; +package ru.clearing.classes.statics.data.profile; import ru.clearing.classes.ConstSerializable; import ru.spcex.platform.classes.base.SpcexObjectBase; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java similarity index 92% rename from clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java index a0e4f93d6..50fbff743 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/user/ClearingUser.java @@ -1,4 +1,4 @@ -package ru.clearing.classes.StaticData.User; +package ru.clearing.classes.statics.data.user; import ru.clearing.classes.ConstSerializable; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java index 21ab5d97c..64dc14d4d 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java @@ -2,9 +2,9 @@ package ru.spcex.clearing.imdg.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.lang.NonNull; -import ru.clearing.classes.StaticData.Company.Company; -import ru.clearing.classes.StaticData.Company.CompanyUpdate; -import ru.clearing.classes.StaticData.Profile.CompanyInfo; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.company.CompanyUpdate; +import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.spcex.clearing.imdg.base.BusinessEventMapStore; import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java index 30e21db9e..801be1c1c 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java @@ -4,8 +4,8 @@ import org.springframework.dao.support.DataAccessUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.Company; -import ru.clearing.classes.StaticData.Profile.CompanyInfo; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.profile.CompanyInfo; import ru.spcex.clearing.imdg.base.BusinessObjectMapStore; import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java index e6dc11297..ee62a53af 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.CompanyRoleSet; +import ru.clearing.classes.statics.data.company.CompanyRoleSet; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.clearing.imdg.IMDGDistributedNames; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java index 74dfa90af..5952a177b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.CompanySymbols; +import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; import ru.spcex.clearing.imdg.utils.DbUtilsHelper; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java index cab560cc2..f03a3c79f 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Profile.Contact; +import ru.clearing.classes.statics.data.profile.Contact; import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; import ru.spcex.clearing.imdg.utils.DbUtilsHelper; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/KeyRateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/KeyRateMapStore.java index 6280d351c..ace520cd7 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/KeyRateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/KeyRateMapStore.java @@ -2,12 +2,11 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Misc.KeyRate; +import ru.clearing.classes.statics.data.misc.KeyRate; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.utils.TimeUtil; -import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java index 113780189..cd635835b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Misc.MoneyMarketSecurity; +import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity; import ru.spcex.clearing.imdg.base.TemplateMapStore; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.utils.TimeUtil; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java index ca3519005..8b21fffdb 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java @@ -2,7 +2,7 @@ package ru.spcex.clearing.imdg.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Profile.ProfileDocument; +import ru.clearing.classes.statics.data.profile.ProfileDocument; import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import ru.spcex.clearing.imdg.utils.TimeUtil; diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java index 1f652cdf2..fdb081b63 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java @@ -7,8 +7,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.StaticData.Company.Company; -import ru.clearing.classes.StaticData.Company.CompanyUpdate; +import ru.clearing.classes.statics.data.company.Company; +import ru.clearing.classes.statics.data.company.CompanyUpdate; import ru.spcex.clearing.imdg.IMDGDistributedNames; @Service diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java index 02ddfbcf4..33f330bc6 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.StaticData.Misc.MoneyMarketSecurity; +import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/KeyRateService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/KeyRateService.java index f77e2eb5d..92c3cdf26 100644 --- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/KeyRateService.java +++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/KeyRateService.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import ru.clearing.classes.StaticData.Misc.KeyRate; +import ru.clearing.classes.statics.data.misc.KeyRate; import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts;