diff --git a/clearing-parent/storage/pom.xml b/clearing-parent/imdg/pom.xml similarity index 91% rename from clearing-parent/storage/pom.xml rename to clearing-parent/imdg/pom.xml index 2021eb4ba..2d54dc66f 100644 --- a/clearing-parent/storage/pom.xml +++ b/clearing-parent/imdg/pom.xml @@ -4,9 +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 - storage - Clearing storage - Clearing storage module + imdg + Clearing in memory data grid jar SPCEX-1.0.0.0 @@ -76,8 +75,7 @@ - - ru.spcex.clearing.storage.StorageApplication + ru.spcex.clearing.imdg.IMDGApplication diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/IMDGApplication.java similarity index 62% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/IMDGApplication.java index 2a75e5f7a..917737e04 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/IMDGApplication.java @@ -1,18 +1,18 @@ -package ru.spcex.clearing.storage; +package ru.spcex.clearing.imdg; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @SpringBootApplication -public class StorageApplication { +public class IMDGApplication { public static void main(String[] args) { try { - SpringApplicationBuilder builder = new SpringApplicationBuilder(StorageApplication.class); + SpringApplicationBuilder builder = new SpringApplicationBuilder(IMDGApplication.class); builder.run(args); } catch (Throwable e) { - LoggerFactory.getLogger(StorageApplication.class).error("STORAGE start failed: {} -> {}", e.getClass().getSimpleName(), e.getMessage()); + LoggerFactory.getLogger(IMDGApplication.class).error("STORAGE start failed: {} -> {}", e.getClass().getSimpleName(), e.getMessage()); System.exit(-1); } } diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessEventMapStore.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessEventMapStore.java index 861e18b9a..96316a74e 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessEventMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.base; +package ru.spcex.clearing.imdg.base; import org.springframework.jdbc.core.JdbcTemplate; import ru.clearing.classes.objects.BusinessEvent; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java similarity index 96% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java index 64e3093cf..3a7c7e706 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/BusinessObjectMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.base; +package ru.spcex.clearing.imdg.base; import org.springframework.jdbc.core.JdbcTemplate; import ru.clearing.classes.objects.BusinessObject; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryMapStore.java similarity index 96% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryMapStore.java index d9fe9b7cc..91414e4c5 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/DictionaryMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.base; +package ru.spcex.clearing.imdg.base; import com.hazelcast.core.MapLoader; import org.slf4j.Logger; @@ -12,7 +12,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; -import static ru.spcex.clearing.storage.base.ObjectBaseMapStore.MAX_IN_CLAUSE_SIZE; +import static ru.spcex.clearing.imdg.base.ObjectBaseMapStore.MAX_IN_CLAUSE_SIZE; /** * Store для словарей стандартных - из ID, CODE, NAME. diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java index e1852b4fa..c87d157c7 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/ObjectBaseMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.base; +package ru.spcex.clearing.imdg.base; import org.springframework.dao.support.DataAccessUtils; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java index 532426ea3..aa8e5342a 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/base/SimpleObjectMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.base; +package ru.spcex.clearing.imdg.base; import com.hazelcast.core.MapStore; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -8,7 +8,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SqlTypeValue; import org.springframework.jdbc.core.StatementCreatorUtils; import org.springframework.lang.NonNull; -import ru.spcex.clearing.storage.utils.BigDecimalUtil; +import ru.spcex.clearing.imdg.utils.BigDecimalUtil; import ru.spcex.platform.classes.base.SpcexObjectBase; import java.math.BigDecimal; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java index ec8ab0853..21ab5d97c 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/CompanyUpdateMapStore.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.storage.businessevent; +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.spcex.clearing.storage.base.BusinessEventMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; -import ru.spcex.clearing.storage.utils.TimeUtil; +import ru.spcex.clearing.imdg.base.BusinessEventMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.utils.TimeUtil; import java.util.ArrayList; import java.util.Arrays; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java similarity index 96% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java index 243f07a11..30e21db9e 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.businessobject; +package ru.spcex.clearing.imdg.businessobject; import org.springframework.dao.support.DataAccessUtils; import org.springframework.jdbc.core.JdbcTemplate; @@ -6,9 +6,9 @@ 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.spcex.clearing.storage.base.BusinessObjectMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; -import ru.spcex.clearing.storage.utils.TimeUtil; +import ru.spcex.clearing.imdg.base.BusinessObjectMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.utils.TimeUtil; import java.util.*; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ConfigurationRootElement.java similarity index 96% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ConfigurationRootElement.java index 75dc99b8a..68944e935 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ConfigurationRootElement.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; /** diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java index da5e28c27..483b1942f 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.slf4j.Logger; @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -import ru.spcex.clearing.storage.error.ModuleInitializeException; +import ru.spcex.clearing.imdg.error.ModuleInitializeException; import javax.sql.DataSource; import java.sql.Connection; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DfaConfig.java similarity index 93% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DfaConfig.java index dde133d1a..dba3920f4 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DfaConfig.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; public class DfaConfig { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java index d4d02655f..ab36d0ad8 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; import com.hazelcast.config.*; import com.hazelcast.core.Hazelcast; @@ -43,7 +43,6 @@ public class HazelcastConfiguration { ); config.addMapConfig(poolMapConfigs.map_AllowedDictionary()); - config.addMapConfig(poolMapConfigs.map_ClearingMemberCategoryDictionary()); config.addMapConfig(poolMapConfigs.map_CompanyRoleDictionary()); config.addMapConfig(poolMapConfigs.map_CompanySymbolDictionary()); config.addMapConfig(poolMapConfigs.map_ContactTypeDictionary()); diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java similarity index 88% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java index 0dcca74d9..4ce9f09bb 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/PoolMapConfigs.java @@ -1,17 +1,17 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; import com.hazelcast.config.*; import com.hazelcast.core.MapLoader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import ru.spcex.clearing.storage.businessevent.CompanyUpdateMapStore; -import ru.spcex.clearing.storage.businessobject.CompanyMapStore; -import ru.spcex.clearing.storage.dictionary.*; -import ru.spcex.clearing.storage.object.CompanyRoleSetMapStore; -import ru.spcex.clearing.storage.object.CompanySymbolsMapStore; -import ru.spcex.clearing.storage.object.ContactMapStore; -import ru.spcex.clearing.storage.object.ProfileDocumentMapStore; -import ru.spcex.clearing.storage.utils.IMDGDistributedNames; +import ru.spcex.clearing.imdg.businessevent.CompanyUpdateMapStore; +import ru.spcex.clearing.imdg.businessobject.CompanyMapStore; +import ru.spcex.clearing.imdg.dictionary.*; +import ru.spcex.clearing.imdg.object.CompanyRoleSetMapStore; +import ru.spcex.clearing.imdg.object.CompanySymbolsMapStore; +import ru.spcex.clearing.imdg.object.ContactMapStore; +import ru.spcex.clearing.imdg.object.ProfileDocumentMapStore; +import ru.spcex.clearing.imdg.utils.IMDGDistributedNames; @Configuration public class PoolMapConfigs { @@ -70,12 +70,6 @@ public class PoolMapConfigs { .setNearCacheConfig(makeDefaultNearCacheConfig()) .addMapIndexConfig(makeMapIndexConfig("code")); } - @Autowired private ClearingMemberCategoryDictionaryMapStore clearingMemberCategoryDictionaryMapStore; - public MapConfig map_ClearingMemberCategoryDictionary() { - return makeDefaultMapConfig(IMDGDistributedNames.Map_ClearingMemberCategoryDictionary, clearingMemberCategoryDictionaryMapStore) - .setNearCacheConfig(makeDefaultNearCacheConfig()) - .addMapIndexConfig(makeMapIndexConfig("code")); - } @Autowired private CompanyRoleDictionaryMapStore companyRoleDictionaryMapStore; public MapConfig map_CompanyRoleDictionary() { return makeDefaultMapConfig(IMDGDistributedNames.Map_CompanyRoleDictionary, companyRoleDictionaryMapStore) diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ServicesElement.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ServicesElement.java index 75e56a89a..172c65bdb 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ServicesElement.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; //import com.fasterxml.jackson.annotation.JsonFormat; //import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElement.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElement.java index d2dbe8077..cb44271ba 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElement.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; //import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElementDatabase.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElementDatabase.java index 5f9a5855f..642bc3ac2 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/SettingsElementDatabase.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.config; +package ru.spcex.clearing.imdg.config; //import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AllowedDictionaryMapStore.java similarity index 84% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AllowedDictionaryMapStore.java index a754db9f4..55eaad879 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/AllowedDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.AllowedDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class AllowedDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanyRoleDictionaryMapStore.java similarity index 85% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanyRoleDictionaryMapStore.java index f86d7d7ec..dbde3714f 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanyRoleDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.CompanyRoleDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class CompanyRoleDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanySymbolDictionaryMapStore.java similarity index 87% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanySymbolDictionaryMapStore.java index 3c7bfc4be..2665f5e48 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CompanySymbolDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.CompanySymbolDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; import java.sql.ResultSet; import java.sql.SQLException; @@ -17,7 +17,7 @@ public class CompanySymbolDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CorporationSoleTypeDictionaryMapStore.java similarity index 86% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CorporationSoleTypeDictionaryMapStore.java index bd25080f4..5d324d7ac 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CorporationSoleTypeDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.CorporationSoleTypeDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class CorporationSoleTypeDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CountryCodeDictionaryMapStore.java similarity index 85% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CountryCodeDictionaryMapStore.java index f23d84be9..e5eb27096 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/CountryCodeDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.CountryCodeDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class CountryCodeDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DocumentTypeDictionaryMapStore.java similarity index 85% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DocumentTypeDictionaryMapStore.java index 55690d9f4..f47fc5172 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DocumentTypeDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.DocumentTypeDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class DocumentTypeDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/LegalKindDictionaryMapStore.java similarity index 84% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/LegalKindDictionaryMapStore.java index 3e270ac1d..9c7017659 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/LegalKindDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.LegalKindDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class LegalKindDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OrganizationTypeDictionaryMapStore.java similarity index 85% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OrganizationTypeDictionaryMapStore.java index 380b8acdd..56bde2298 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/OrganizationTypeDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.OrganizationTypeDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class OrganizationTypeDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/WorkflowStatusDictionaryMapStore.java similarity index 85% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/WorkflowStatusDictionaryMapStore.java index d807e1842..5d9a97501 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/WorkflowStatusDictionaryMapStore.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.storage.dictionary; +package ru.spcex.clearing.imdg.dictionary; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; import ru.clearing.platform.dictionary.WorkflowStatusDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; @Component public class WorkflowStatusDictionaryMapStore extends DictionaryMapStore { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/error/ModuleInitializeException.java similarity index 90% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/error/ModuleInitializeException.java index cfb43521a..f486dd7dd 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/error/ModuleInitializeException.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.error; +package ru.spcex.clearing.imdg.error; public class ModuleInitializeException extends RuntimeException { public ModuleInitializeException() { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java similarity index 92% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java index 322535366..2fa1c286b 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanyRoleSetMapStore.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.storage.object; +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.spcex.clearing.storage.base.ObjectBaseMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import java.util.*; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java similarity index 93% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java index cc1b5dbd3..74dfa90af 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/CompanySymbolsMapStore.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.storage.object; +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.spcex.clearing.storage.base.ObjectBaseMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import java.util.*; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java similarity index 93% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java index b5b5b8dd0..cab560cc2 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ContactMapStore.java @@ -1,10 +1,10 @@ -package ru.spcex.clearing.storage.object; +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.spcex.clearing.storage.base.ObjectBaseMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; import java.util.*; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java similarity index 94% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java index 0c6fe0688..ca3519005 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/ProfileDocumentMapStore.java @@ -1,11 +1,11 @@ -package ru.spcex.clearing.storage.object; +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.spcex.clearing.storage.base.ObjectBaseMapStore; -import ru.spcex.clearing.storage.utils.DbUtilsHelper; -import ru.spcex.clearing.storage.utils.TimeUtil; +import ru.spcex.clearing.imdg.base.ObjectBaseMapStore; +import ru.spcex.clearing.imdg.utils.DbUtilsHelper; +import ru.spcex.clearing.imdg.utils.TimeUtil; import java.util.*; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java index e19dcc15f..677dc5367 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractHazelcastLifecycleSupport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.services; +package ru.spcex.clearing.imdg.services; import com.hazelcast.config.MapStoreConfig; import com.hazelcast.core.HazelcastInstance; @@ -12,9 +12,9 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.clearing.storage.base.DictionaryMapStore; -import ru.spcex.clearing.storage.base.SimpleObjectMapStore; -import ru.spcex.clearing.storage.utils.IMDGDistributedNames; +import ru.spcex.clearing.imdg.base.DictionaryMapStore; +import ru.spcex.clearing.imdg.base.SimpleObjectMapStore; +import ru.spcex.clearing.imdg.utils.IMDGDistributedNames; import java.util.ArrayList; import java.util.List; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java similarity index 95% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java index ea2c3310f..c80a0716a 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/AbstractUpdateMapService.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.services; +package ru.spcex.clearing.imdg.services; import com.hazelcast.core.EntryEvent; import com.hazelcast.core.HazelcastInstance; @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import ru.clearing.classes.objects.BusinessEvent; -import ru.spcex.clearing.storage.utils.IMDGDistributedNames; +import ru.spcex.clearing.imdg.utils.IMDGDistributedNames; import java.time.Instant; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java similarity index 96% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java index 944a4e009..e248a2054 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/HazelcastLifecycleSupport.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.services; +package ru.spcex.clearing.imdg.services; import com.hazelcast.core.HazelcastInstance; import org.slf4j.Logger; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java similarity index 93% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java index 63e50b394..11ff3a661 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/services/UpdateMapService.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.services; +package ru.spcex.clearing.imdg.services; import com.hazelcast.core.EntryEvent; import com.hazelcast.core.HazelcastInstance; @@ -9,7 +9,7 @@ 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.spcex.clearing.storage.utils.IMDGDistributedNames; +import ru.spcex.clearing.imdg.utils.IMDGDistributedNames; @Service public class UpdateMapService extends AbstractUpdateMapService { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/BigDecimalUtil.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/BigDecimalUtil.java index 4907c447d..98164f6e1 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/BigDecimalUtil.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.utils; +package ru.spcex.clearing.imdg.utils; import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbDefaultConfig.java similarity index 86% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbDefaultConfig.java index 200106c99..3ff2647b2 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbDefaultConfig.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.utils; +package ru.spcex.clearing.imdg.utils; import javax.sql.DataSource; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbUtilsHelper.java similarity index 98% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbUtilsHelper.java index ffd4dd79c..932f413c6 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/DbUtilsHelper.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.utils; +package ru.spcex.clearing.imdg.utils; import org.apache.commons.lang3.StringUtils; diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/IMDGDistributedNames.java similarity index 97% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/IMDGDistributedNames.java index e55aafaaf..a132554ec 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/IMDGDistributedNames.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.utils; +package ru.spcex.clearing.imdg.utils; //fixme перенести в новый модуль IMDGDistributedNames public final class IMDGDistributedNames { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java similarity index 99% rename from clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java index 1aca86579..397878a84 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/utils/TimeUtil.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.storage.utils; +package ru.spcex.clearing.imdg.utils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; diff --git a/clearing-parent/storage/src/main/resources/hazelcast.yaml b/clearing-parent/imdg/src/main/resources/hazelcast.yaml similarity index 100% rename from clearing-parent/storage/src/main/resources/hazelcast.yaml rename to clearing-parent/imdg/src/main/resources/hazelcast.yaml diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 6f86a0c25..795356502 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -19,7 +19,7 @@ dictionary classes backend-api - storage + imdg db-scripts dbf-importer dbf-exporter diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java deleted file mode 100644 index f5895b02e..000000000 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java +++ /dev/null @@ -1,24 +0,0 @@ -package ru.spcex.clearing.storage.dictionary; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.platform.dictionary.ClearingMemberCategoryDictionary; -import ru.spcex.clearing.storage.base.DictionaryMapStore; - -@Component -public class ClearingMemberCategoryDictionaryMapStore extends DictionaryMapStore { - - public ClearingMemberCategoryDictionaryMapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getTableName() { - return "CLEARING_MEMBER_CATEGORY_DICTIONARY"; - } - - @Override - public ClearingMemberCategoryDictionary getDictionaryObject() { - return new ClearingMemberCategoryDictionary(); - } -} diff --git a/platform-parent/platform-storage-api/pom.xml b/platform-parent/platform-imdg-api/pom.xml similarity index 100% rename from platform-parent/platform-storage-api/pom.xml rename to platform-parent/platform-imdg-api/pom.xml diff --git a/platform-parent/platform-storage-api/src/main/java/ru/spcex/platform/storage/api/Storage.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/api/Storage.java similarity index 95% rename from platform-parent/platform-storage-api/src/main/java/ru/spcex/platform/storage/api/Storage.java rename to platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/api/Storage.java index 755ff5c6b..8726f045f 100644 --- a/platform-parent/platform-storage-api/src/main/java/ru/spcex/platform/storage/api/Storage.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/platform/imdg/api/Storage.java @@ -1,4 +1,4 @@ -package ru.spcex.platform.storage.api; +package ru.spcex.platform.imdg.api; import ru.spcex.platform.classes.base.SpcexObjectBase;