rename storage

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">
 	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>storage</artifactId>
-    <name>Clearing storage</name>
-    <description>Clearing storage module</description>
+    <artifactId>imdg</artifactId>
+    <name>Clearing in memory data grid</name>
     <packaging>jar</packaging>
     <version>SPCEX-1.0.0.0</version>
 
@@ -76,8 +75,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <!--<classpathPrefix>../lib/</classpathPrefix>-->
-                            <mainClass>ru.spcex.clearing.storage.StorageApplication</mainClass>
+                            <mainClass>ru.spcex.clearing.imdg.IMDGApplication</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

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);
         }
     }

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;

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;

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.

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;

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;

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;

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.*;
 

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;
 
 
 /**

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;

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 {

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());

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)

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;

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;
 

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;
 

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<AllowedDictionary> {

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<CompanyRoleDictionary> {

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<CompanyS
 
     @Override
     public String getTableName() {
-        return "DD";
+        return "COMPANY_SYMBOL_DICTIONARY";
     }
 
     @Override

clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ContactTypeDictionaryMapStore.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.ContactTypeDictionary;
-import ru.spcex.clearing.storage.base.DictionaryMapStore;
+import ru.spcex.clearing.imdg.base.DictionaryMapStore;
 
 @Component
 public class ContactTypeDictionaryMapStore extends DictionaryMapStore<ContactTypeDictionary> {

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<CorporationSoleTypeDictionary> {

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<CountryCodeDictionary> {

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<DocumentTypeDictionary> {

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<LegalKindDictionary> {

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<OrganizationTypeDictionary> {

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<WorkflowStatusDictionary> {

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() {

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.*;
 

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.*;
 

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.*;
 

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.*;
 

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;

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;
 

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;

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 {

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;

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;

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;
 

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 {

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;

clearing-parent/pom.xml

@@ -19,7 +19,7 @@
         <module>dictionary</module>
         <module>classes</module>
         <module>backend-api</module>
-        <module>storage</module>
+        <module>imdg</module>
         <module>db-scripts</module>
         <module>dbf-importer</module>
         <module>dbf-exporter</module>

clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java

@@ -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<ClearingMemberCategoryDictionary> {
-
-    public ClearingMemberCategoryDictionaryMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getTableName() {
-        return "CLEARING_MEMBER_CATEGORY_DICTIONARY";
-    }
-
-    @Override
-    public ClearingMemberCategoryDictionary getDictionaryObject() {
-        return new ClearingMemberCategoryDictionary();
-    }
-}

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;