From d4475c7dea41eb28bc3c6d13b9512ecb5012e563 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Mon, 25 Jul 2022 12:14:18 +0300 Subject: [PATCH] add storage module --- .idea/.gitignore | 8 +++ .idea/compiler.xml | 22 +++++++ .idea/encodings.xml | 12 ++++ .idea/jarRepositories.xml | 25 ++++++++ .idea/misc.xml | 24 +++++++ .idea/runConfigurations.xml | 10 +++ .idea/vcs.xml | 6 ++ .../target/dfa-classes-DFA-1.0.0.0.jar | Bin 39740 -> 0 bytes .../target/maven-archiver/pom.properties | 4 -- .../compile/default-compile/createdFiles.lst | 13 ---- .../compile/default-compile/inputFiles.lst | 8 --- clearing-dictionary/CHANGELOG.md | 3 - .../backend-api}/pom.xml | 9 +-- .../frontendapi/FrontendApplication.java | 0 .../backend-api}/src/main/web/WEB-INF/web.xml | 0 .../classes}/pom.xml | 17 ++--- .../clearing/classes/ConstSerializable.java | 0 .../classes/StaticData/Company/Company.java | 0 .../StaticData/Company/CompanyRoleSet.java | 0 .../StaticData/Company/CompanySymbols.java | 0 .../StaticData/Company/CompanyUpdate.java | 2 - .../StaticData/Profile/CompanyInfo.java | 1 - .../classes/StaticData/Profile/Contact.java | 0 .../StaticData/Profile/ProfileDocument.java | 0 .../classes/StaticData/User/ClearingUser.java | 0 .../classes/objects/BusinessEvent.java | 0 .../classes/objects/BusinessObject.java | 0 .../clearing/classes/objects/ObjectBase.java | 0 .../ru/clearing/common/interfaces/WithId.java | 0 .../db-scripts}/.gitignore | 0 .../db-scripts}/CHANGELOG.md | 0 .../db-scripts}/README.md | 0 .../db-scripts}/pom.xml | 9 ++- .../src/main/resources/db/DATA.sql | 0 .../db-scripts}/src/main/resources/db/DDL.sql | 0 .../src/main/resources/db/DDL_first.sql | 0 .../src/main/resources/db/firebird.conf | 0 .../src/main/resources/db/readme.txt | 0 .../dictionary}/pom.xml | 12 ++-- .../dictionary/AbstractDictionary.java | 0 .../dictionary/AllowedDictionary.java | 0 .../ClearingMemberCategoryDictionary.java | 0 .../dictionary/CompanyRoleDictionary.java | 0 .../dictionary/CompanySymbolDictionary.java | 0 .../ConstDictionarySerializable.java | 0 .../dictionary/ContactTypeDictionary.java | 0 .../CorporationSoleTypeDictionary.java | 0 .../dictionary/CountryCodeDictionary.java | 0 .../platform/dictionary/Dictionary.java | 0 .../dictionary/DocumentTypeDictionary.java | 0 .../dictionary/LegalKindDictionary.java | 0 .../OrganizationTypeDictionary.java | 0 .../dictionary/WorkflowStatusDictionary.java | 0 clearing-parent/pom.xml | 33 ++++++++++ {storage => clearing-parent/storage}/pom.xml | 21 +++--- .../clearing/storage/StorageApplication.java | 0 .../storage/base/BusinessEventMapStore.java | 4 -- .../storage/base/BusinessObjectMapStore.java | 0 .../storage/base/DictionaryMapStore.java | 2 +- .../storage/base/LoggingMapStore.java | 8 --- .../storage/base/ObjectBaseMapStore.java | 0 .../storage/base/SimpleObjectMapStore.java | 0 .../businessevent/CompanyUpdateMapStore.java | 1 - .../businessobject/CompanyMapStore.java | 0 .../config/ConfigurationRootElement.java | 0 .../storage/config/DbConnectionConfig.java | 0 .../clearing/storage/config/DfaConfig.java | 0 .../config/HazelcastConfiguration.java | 1 - .../storage/config/PlatformStorageBeans.java | 0 .../storage/config/PoolMapConfigs.java | 0 .../storage/config/ServicesElement.java | 0 .../storage/config/SettingsElement.java | 0 .../config/SettingsElementDatabase.java | 0 .../dictionary/AllowedDictionaryMapStore.java | 0 ...aringMemberCategoryDictionaryMapStore.java | 0 .../CompanyRoleDictionaryMapStore.java | 0 .../CompanySymbolDictionaryMapStore.java | 0 .../ContactTypeDictionaryMapStore.java | 0 ...CorporationSoleTypeDictionaryMapStore.java | 0 .../CountryCodeDictionaryMapStore.java | 0 .../DocumentTypeDictionaryMapStore.java | 0 .../LegalKindDictionaryMapStore.java | 0 .../OrganizationTypeDictionaryMapStore.java | 0 .../WorkflowStatusDictionaryMapStore.java | 0 .../error/ModuleInitializeException.java | 38 +++++------ .../object/CompanyRoleSetMapStore.java | 1 - .../object/CompanySymbolsMapStore.java | 1 - .../storage/object/ContactMapStore.java | 0 .../object/ProfileDocumentMapStore.java | 0 .../AbstractHazelcastLifecycleSupport.java | 12 +--- .../services/AbstractUpdateMapService.java | 0 .../services/HazelcastLifecycleSupport.java | 0 .../storage/services/UpdateMapService.java | 0 .../storage/utils/BigDecimalUtil.java | 0 .../storage/utils/DbDefaultConfig.java | 1 - .../clearing/storage/utils/DbUtilsHelper.java | 0 .../storage/utils/IMDGDistributedNames.java | 60 +++++++++--------- .../clearing/storage/utils/TimeUtil.java | 0 db-scripts/.gitignore | 12 ---- platform-parent/pom.xml | 22 +++++++ pom.xml | 24 +++++-- 101 files changed, 265 insertions(+), 161 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml delete mode 100644 clearing-classes/target/dfa-classes-DFA-1.0.0.0.jar delete mode 100644 clearing-classes/target/maven-archiver/pom.properties delete mode 100644 clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst delete mode 100644 clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst delete mode 100644 clearing-dictionary/CHANGELOG.md rename {frontendapi => clearing-parent/backend-api}/pom.xml (94%) rename {frontendapi => clearing-parent/backend-api}/src/main/java/ru/spcex/clearing/frontendapi/FrontendApplication.java (100%) rename {frontendapi => clearing-parent/backend-api}/src/main/web/WEB-INF/web.xml (100%) rename {clearing-classes => clearing-parent/classes}/pom.xml (61%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/ConstSerializable.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Company/Company.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java (82%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java (98%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/objects/BusinessEvent.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/objects/BusinessObject.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/classes/objects/ObjectBase.java (100%) rename {clearing-classes => clearing-parent/classes}/src/main/java/ru/clearing/common/interfaces/WithId.java (100%) rename {clearing-dictionary => clearing-parent/db-scripts}/.gitignore (100%) rename {db-scripts => clearing-parent/db-scripts}/CHANGELOG.md (100%) rename {db-scripts => clearing-parent/db-scripts}/README.md (100%) rename {db-scripts => clearing-parent/db-scripts}/pom.xml (95%) rename {db-scripts => clearing-parent/db-scripts}/src/main/resources/db/DATA.sql (100%) rename {db-scripts => clearing-parent/db-scripts}/src/main/resources/db/DDL.sql (100%) rename {db-scripts => clearing-parent/db-scripts}/src/main/resources/db/DDL_first.sql (100%) rename {db-scripts => clearing-parent/db-scripts}/src/main/resources/db/firebird.conf (100%) rename {db-scripts => clearing-parent/db-scripts}/src/main/resources/db/readme.txt (100%) rename {clearing-dictionary => clearing-parent/dictionary}/pom.xml (94%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/AbstractDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/AllowedDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/CompanyRoleDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/CompanySymbolDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/ConstDictionarySerializable.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/ContactTypeDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/CorporationSoleTypeDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/CountryCodeDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/Dictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/DocumentTypeDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/LegalKindDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/OrganizationTypeDictionary.java (100%) rename {clearing-dictionary => clearing-parent/dictionary}/src/main/java/ru/clearing/platform/dictionary/WorkflowStatusDictionary.java (100%) create mode 100644 clearing-parent/pom.xml rename {storage => clearing-parent/storage}/pom.xml (88%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/StorageApplication.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java (84%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java (92%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java (98%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java (98%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/PlatformStorageBeans.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/ContactTypeDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java (95%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java (97%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java (97%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java (96%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java (91%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java (100%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java (98%) rename {storage => clearing-parent/storage}/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java (100%) delete mode 100644 db-scripts/.gitignore create mode 100644 platform-parent/pom.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..73f69e095 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..a216a5eca --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..0b4293e3c --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..1f8f97ffb --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..8b5f3db4e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 000000000..797acea53 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/clearing-classes/target/dfa-classes-DFA-1.0.0.0.jar b/clearing-classes/target/dfa-classes-DFA-1.0.0.0.jar deleted file mode 100644 index 1f3bc1eea11b0a247599779688428219f6512be4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39740 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 H3i 4.0.0 - frontendapi + backend-api Clearing Frontend API Clearing frontend API module war - - clearing + + clearing-parent ru.spcex.clearing SPCEX-1.0.0.0 + @@ -25,7 +26,7 @@ - frontendapi + backend-api org.apache.maven.plugins diff --git a/frontendapi/src/main/java/ru/spcex/clearing/frontendapi/FrontendApplication.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/frontendapi/FrontendApplication.java similarity index 100% rename from frontendapi/src/main/java/ru/spcex/clearing/frontendapi/FrontendApplication.java rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/frontendapi/FrontendApplication.java diff --git a/frontendapi/src/main/web/WEB-INF/web.xml b/clearing-parent/backend-api/src/main/web/WEB-INF/web.xml similarity index 100% rename from frontendapi/src/main/web/WEB-INF/web.xml rename to clearing-parent/backend-api/src/main/web/WEB-INF/web.xml diff --git a/clearing-classes/pom.xml b/clearing-parent/classes/pom.xml similarity index 61% rename from clearing-classes/pom.xml rename to clearing-parent/classes/pom.xml index 402e26058..206e686c5 100644 --- a/clearing-classes/pom.xml +++ b/clearing-parent/classes/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - clearing-classes + classes Clearing classes Clearing classes module jar - - clearing - ru.spcex.clearing + + clearing-parent + ru.spcex.clearing SPCEX-1.0.0.0 @@ -21,14 +21,7 @@ - - - - - - - - + diff --git a/clearing-classes/src/main/java/ru/clearing/classes/ConstSerializable.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/ConstSerializable.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/ConstSerializable.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyRoleSet.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanySymbols.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java similarity index 82% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java index 188bcf9a4..fa416ae10 100644 --- a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/CompanyUpdate.java @@ -1,9 +1,7 @@ package ru.clearing.classes.StaticData.Company; import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.StaticData.Profile.CompanyInfo; import ru.clearing.classes.objects.BusinessEvent; -import ru.clearing.classes.objects.BusinessObject; /** * DB: COMPANY_UPDATE diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java similarity index 98% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java index 7ae5569e6..52ae358b9 100644 --- a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/CompanyInfo.java @@ -1,7 +1,6 @@ package ru.clearing.classes.StaticData.Profile; import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; import ru.clearing.classes.objects.ObjectBase; /** diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/Contact.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Profile/ProfileDocument.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/User/ClearingUser.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessEvent.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/objects/BusinessObject.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessObject.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/objects/BusinessObject.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/objects/BusinessObject.java diff --git a/clearing-classes/src/main/java/ru/clearing/classes/objects/ObjectBase.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/objects/ObjectBase.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/classes/objects/ObjectBase.java rename to clearing-parent/classes/src/main/java/ru/clearing/classes/objects/ObjectBase.java diff --git a/clearing-classes/src/main/java/ru/clearing/common/interfaces/WithId.java b/clearing-parent/classes/src/main/java/ru/clearing/common/interfaces/WithId.java similarity index 100% rename from clearing-classes/src/main/java/ru/clearing/common/interfaces/WithId.java rename to clearing-parent/classes/src/main/java/ru/clearing/common/interfaces/WithId.java diff --git a/clearing-dictionary/.gitignore b/clearing-parent/db-scripts/.gitignore similarity index 100% rename from clearing-dictionary/.gitignore rename to clearing-parent/db-scripts/.gitignore diff --git a/db-scripts/CHANGELOG.md b/clearing-parent/db-scripts/CHANGELOG.md similarity index 100% rename from db-scripts/CHANGELOG.md rename to clearing-parent/db-scripts/CHANGELOG.md diff --git a/db-scripts/README.md b/clearing-parent/db-scripts/README.md similarity index 100% rename from db-scripts/README.md rename to clearing-parent/db-scripts/README.md diff --git a/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml similarity index 95% rename from db-scripts/pom.xml rename to clearing-parent/db-scripts/pom.xml index 634e2897e..7717d7bde 100644 --- a/db-scripts/pom.xml +++ b/clearing-parent/db-scripts/pom.xml @@ -7,12 +7,11 @@ db-scripts db-scripts db-scripts for PostgreSQL - jar - 1.0.0 + SPCEX-1.0.0.0 - - clearing - ru.spcex.clearing + + clearing-parent + ru.spcex.clearing SPCEX-1.0.0.0 diff --git a/db-scripts/src/main/resources/db/DATA.sql b/clearing-parent/db-scripts/src/main/resources/db/DATA.sql similarity index 100% rename from db-scripts/src/main/resources/db/DATA.sql rename to clearing-parent/db-scripts/src/main/resources/db/DATA.sql diff --git a/db-scripts/src/main/resources/db/DDL.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL.sql similarity index 100% rename from db-scripts/src/main/resources/db/DDL.sql rename to clearing-parent/db-scripts/src/main/resources/db/DDL.sql diff --git a/db-scripts/src/main/resources/db/DDL_first.sql b/clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql similarity index 100% rename from db-scripts/src/main/resources/db/DDL_first.sql rename to clearing-parent/db-scripts/src/main/resources/db/DDL_first.sql diff --git a/db-scripts/src/main/resources/db/firebird.conf b/clearing-parent/db-scripts/src/main/resources/db/firebird.conf similarity index 100% rename from db-scripts/src/main/resources/db/firebird.conf rename to clearing-parent/db-scripts/src/main/resources/db/firebird.conf diff --git a/db-scripts/src/main/resources/db/readme.txt b/clearing-parent/db-scripts/src/main/resources/db/readme.txt similarity index 100% rename from db-scripts/src/main/resources/db/readme.txt rename to clearing-parent/db-scripts/src/main/resources/db/readme.txt diff --git a/clearing-dictionary/pom.xml b/clearing-parent/dictionary/pom.xml similarity index 94% rename from clearing-dictionary/pom.xml rename to clearing-parent/dictionary/pom.xml index dd81e0b7e..cf6ecd958 100644 --- a/clearing-dictionary/pom.xml +++ b/clearing-parent/dictionary/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - clearing-dictionary - PLATFORM dictionary - PLATFORM dictionary + dictionary + Clearing dictionary + Clearing dictionary jar SPCEX-1.0.0.0 - - clearing - ru.spcex.clearing + + clearing-parent + ru.spcex.clearing SPCEX-1.0.0.0 diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/AbstractDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AbstractDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/AbstractDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AbstractDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/AllowedDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AllowedDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/AllowedDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/AllowedDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ClearingMemberCategoryDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CompanyRoleDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CompanyRoleDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CompanyRoleDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CompanyRoleDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CompanySymbolDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CompanySymbolDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CompanySymbolDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CompanySymbolDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ConstDictionarySerializable.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ConstDictionarySerializable.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ConstDictionarySerializable.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ConstDictionarySerializable.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ContactTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ContactTypeDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/ContactTypeDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ContactTypeDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CorporationSoleTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CorporationSoleTypeDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CorporationSoleTypeDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CorporationSoleTypeDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CountryCodeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CountryCodeDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/CountryCodeDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/CountryCodeDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/Dictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/Dictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/Dictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/Dictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/DocumentTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/DocumentTypeDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/DocumentTypeDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/DocumentTypeDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/LegalKindDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/LegalKindDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/LegalKindDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/LegalKindDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/OrganizationTypeDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OrganizationTypeDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/OrganizationTypeDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/OrganizationTypeDictionary.java diff --git a/clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/WorkflowStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/WorkflowStatusDictionary.java similarity index 100% rename from clearing-dictionary/src/main/java/ru/clearing/platform/dictionary/WorkflowStatusDictionary.java rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/WorkflowStatusDictionary.java diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml new file mode 100644 index 000000000..4f1813f10 --- /dev/null +++ b/clearing-parent/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + clearing-parent + _parent_clearing + Clearing parent module + pom + SPCEX-1.0.0.0 + + + clearing + ru.spcex.clearing + SPCEX-1.0.0.0 + + + + dictionary + classes + backend-api + storage + db-scripts + + + + + + + + + + diff --git a/storage/pom.xml b/clearing-parent/storage/pom.xml similarity index 88% rename from storage/pom.xml rename to clearing-parent/storage/pom.xml index 20925b6be..56c029929 100644 --- a/storage/pom.xml +++ b/clearing-parent/storage/pom.xml @@ -2,14 +2,19 @@ - - clearing - ru.spcex.clearing - SPCEX-1.0.0.0 - - 4.0.0 + 4.0.0 storage + Clearing storage + Clearing storage module + jar + SPCEX-1.0.0.0 + + + clearing-parent + ru.spcex.clearing + SPCEX-1.0.0.0 + 11 @@ -27,13 +32,13 @@ ru.spcex.clearing - clearing-classes + classes SPCEX-1.0.0.0 compile ru.spcex.clearing - clearing-dictionary + dictionary SPCEX-1.0.0.0 compile diff --git a/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/StorageApplication.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java similarity index 84% rename from storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java index c5292f32c..ef6cfa0e3 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessEventMapStore.java @@ -2,11 +2,7 @@ package ru.spcex.clearing.storage.base; import org.springframework.jdbc.core.JdbcTemplate; import ru.clearing.classes.objects.BusinessEvent; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.clearing.storage.utils.TimeUtil; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.Collection; import java.util.Collections; import java.util.Map; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/BusinessObjectMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java index c886d3cef..0a44d80f0 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/DictionaryMapStore.java @@ -1,12 +1,12 @@ package ru.spcex.clearing.storage.base; import com.hazelcast.core.MapLoader; -import ru.clearing.platform.dictionary.Dictionary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.support.DataAccessUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import ru.clearing.platform.dictionary.Dictionary; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java similarity index 92% rename from storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java index 622001a29..6dba79a9f 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/LoggingMapStore.java @@ -3,21 +3,13 @@ package ru.spcex.clearing.storage.base; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.MapLoaderLifecycleSupport; import com.hazelcast.core.MapStore; -//import com.opencsv.CSVWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.lang.NonNull; import ru.clearing.classes.objects.ObjectBase; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.Properties; -import java.util.function.Supplier; /** * MapStore записывающий изменения в файл diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/ObjectBaseMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/base/SimpleObjectMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java similarity index 98% rename from storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java index fff46939c..76c04776e 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java @@ -1,6 +1,5 @@ package ru.spcex.clearing.storage.businessevent; -import org.springframework.dao.support.DataAccessUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessobject/CompanyMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ConfigurationRootElement.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DfaConfig.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java similarity index 98% rename from storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java index 5604eb7dc..775733bea 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.storage.config; import com.hazelcast.config.*; import com.hazelcast.core.HazelcastInstance; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.hazelcast.HazelcastInstanceFactory; import org.springframework.context.annotation.Bean; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/PlatformStorageBeans.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PlatformStorageBeans.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/PlatformStorageBeans.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PlatformStorageBeans.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/ServicesElement.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElement.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/SettingsElementDatabase.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/AllowedDictionaryMapStore.java diff --git a/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 similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ClearingMemberCategoryDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanyRoleDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CompanySymbolDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ContactTypeDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ContactTypeDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/ContactTypeDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/ContactTypeDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CorporationSoleTypeDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/CountryCodeDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/DocumentTypeDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/LegalKindDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/OrganizationTypeDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/dictionary/WorkflowStatusDictionaryMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java similarity index 95% rename from storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java index 0e40d7936..cfb43521a 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/error/ModuleInitializeException.java @@ -1,19 +1,19 @@ -package ru.spcex.clearing.storage.error; - -public class ModuleInitializeException extends RuntimeException { - public ModuleInitializeException() { - } - - public ModuleInitializeException(String message) { - super(message); - } - - public ModuleInitializeException(String message, Throwable cause) { - super(message, cause); - } - - public ModuleInitializeException(Throwable cause) { - super(cause); - } - -} +package ru.spcex.clearing.storage.error; + +public class ModuleInitializeException extends RuntimeException { + public ModuleInitializeException() { + } + + public ModuleInitializeException(String message) { + super(message); + } + + public ModuleInitializeException(String message, Throwable cause) { + super(message, cause); + } + + public ModuleInitializeException(Throwable cause) { + super(cause); + } + +} diff --git a/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java similarity index 97% rename from storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java index 43e397681..322535366 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanyRoleSetMapStore.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.storage.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.Company; import ru.clearing.classes.StaticData.Company.CompanyRoleSet; import ru.spcex.clearing.storage.base.ObjectBaseMapStore; import ru.spcex.clearing.storage.utils.DbUtilsHelper; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java similarity index 97% rename from storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java index 7f8d25c92..cc1b5dbd3 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/CompanySymbolsMapStore.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.storage.object; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.clearing.classes.StaticData.Company.CompanyRoleSet; import ru.clearing.classes.StaticData.Company.CompanySymbols; import ru.spcex.clearing.storage.base.ObjectBaseMapStore; import ru.spcex.clearing.storage.utils.DbUtilsHelper; diff --git a/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ContactMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/object/ProfileDocumentMapStore.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java similarity index 96% rename from storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java index 15f90b64c..63b627678 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractHazelcastLifecycleSupport.java @@ -1,19 +1,14 @@ package ru.spcex.clearing.storage.services; -import com.hazelcast.aggregation.Aggregators; import com.hazelcast.config.MapStoreConfig; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IAtomicLong; import com.hazelcast.core.IMap; import com.hazelcast.core.IdGenerator; -import com.hazelcast.projection.Projections; -import com.hazelcast.query.Predicates; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import ru.clearing.classes.objects.BusinessObject; @@ -21,14 +16,11 @@ import ru.spcex.clearing.storage.base.DictionaryMapStore; import ru.spcex.clearing.storage.base.SimpleObjectMapStore; import ru.spcex.clearing.storage.utils.IMDGDistributedNames; -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; public abstract class AbstractHazelcastLifecycleSupport implements InitializingBean, DisposableBean { /** diff --git a/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/AbstractUpdateMapService.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/HazelcastLifecycleSupport.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/services/UpdateMapService.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/BigDecimalUtil.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java similarity index 91% rename from storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java index 644f937ee..200106c99 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbDefaultConfig.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.storage.utils; import javax.sql.DataSource; -import java.nio.file.Paths; public class DbDefaultConfig { public static DataSource getEmbeddedDatabase(String embeddedFilePath) { diff --git a/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/DbUtilsHelper.java diff --git a/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java similarity index 98% rename from storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java index 65a4df1f0..e55aafaaf 100644 --- a/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/IMDGDistributedNames.java @@ -1,30 +1,30 @@ -package ru.spcex.clearing.storage.utils; - -//fixme перенести в новый модуль IMDGDistributedNames -public final class IMDGDistributedNames { - private IMDGDistributedNames() { - } - - public static final String Map_Company = "Map_Company"; - public static final String Map_CompanyUpdate = "Map_CompanyUpdate"; - public static final String Map_CompanyRoleSet = "Map_CompanyRoleSet"; - public static final String Map_CompanySymbols = "Map_CompanySymbols"; -// public static final String Map_CompanyInfo = "Map_CompanyInfo"; интегрировано в Map_Company - public static final String Map_Contact = "Map_Contact"; - public static final String Map_ProfileDocument = "Map_ProfileDocument"; - - public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; - public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; - public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; - public static final String Map_CompanySymbolDictionary = "Map_CompanySymbolDictionary"; - public static final String Map_ContactTypeDictionary = "Map_ContactTypeDictionary"; - public static final String Map_CorporationSoleTypeDictionary = "Map_CorporationSoleTypeDictionary"; - public static final String Map_CountryCodeDictionary = "Map_CountryCodeDictionary"; - public static final String Map_DocumentTypeDictionary = "Map_DocumentTypeDictionary"; - public static final String Map_LegalKindDictionary = "Map_LegalKindDictionary"; - public static final String Map_OrganizationTypeDictionary = "Map_OrganizationTypeDictionary"; - public static final String Map_WorkflowStatusDictionary = "Map_WorkflowStatusDictionary"; - - - public static final String MAP_SEQUENCE_NAME = "MAP_SEQUENCE_NAME"; // todo вынести idGenerator отдельно и завернуть в метод, чтобы не напрямую обращаться. -} +package ru.spcex.clearing.storage.utils; + +//fixme перенести в новый модуль IMDGDistributedNames +public final class IMDGDistributedNames { + private IMDGDistributedNames() { + } + + public static final String Map_Company = "Map_Company"; + public static final String Map_CompanyUpdate = "Map_CompanyUpdate"; + public static final String Map_CompanyRoleSet = "Map_CompanyRoleSet"; + public static final String Map_CompanySymbols = "Map_CompanySymbols"; +// public static final String Map_CompanyInfo = "Map_CompanyInfo"; интегрировано в Map_Company + public static final String Map_Contact = "Map_Contact"; + public static final String Map_ProfileDocument = "Map_ProfileDocument"; + + public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; + public static final String Map_ClearingMemberCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; + public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; + public static final String Map_CompanySymbolDictionary = "Map_CompanySymbolDictionary"; + public static final String Map_ContactTypeDictionary = "Map_ContactTypeDictionary"; + public static final String Map_CorporationSoleTypeDictionary = "Map_CorporationSoleTypeDictionary"; + public static final String Map_CountryCodeDictionary = "Map_CountryCodeDictionary"; + public static final String Map_DocumentTypeDictionary = "Map_DocumentTypeDictionary"; + public static final String Map_LegalKindDictionary = "Map_LegalKindDictionary"; + public static final String Map_OrganizationTypeDictionary = "Map_OrganizationTypeDictionary"; + public static final String Map_WorkflowStatusDictionary = "Map_WorkflowStatusDictionary"; + + + public static final String MAP_SEQUENCE_NAME = "MAP_SEQUENCE_NAME"; // todo вынести idGenerator отдельно и завернуть в метод, чтобы не напрямую обращаться. +} diff --git a/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java similarity index 100% rename from storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java rename to clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/utils/TimeUtil.java diff --git a/db-scripts/.gitignore b/db-scripts/.gitignore deleted file mode 100644 index 9ea567857..000000000 --- a/db-scripts/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.iml -target -lib -.idea -*.log -temp -otc.logs_IS_UNDEFINED -.gitconfig -dependency-reduced-pom.xml -*/otc-test/src/test/resources/dataForDb/*.sql -**/out -preview \ No newline at end of file diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml new file mode 100644 index 000000000..1c4821d40 --- /dev/null +++ b/platform-parent/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + platform-parent + _parent_platform + PLATFORM parent + pom + 1.0.0 + + + ru.spcex.clearing + clearing + SPCEX-1.0.0.0 + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index f8f24506b..a10e855db 100644 --- a/pom.xml +++ b/pom.xml @@ -12,11 +12,8 @@ SPCEX-1.0.0.0 - frontendapi - storage - db-scripts - clearing-classes - clearing-dictionary + clearing-parent + platform-parent @@ -46,7 +43,22 @@ ru.spcex.clearing - frontendapi + backend-api + ${global.project.version} + + + ru.spcex.clearing + classes + ${global.project.version} + + + ru.spcex.clearing + dictionary + ${global.project.version} + + + ru.spcex.clearing + storage ${global.project.version}