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 1f3bc1eea..000000000 Binary files a/clearing-classes/target/dfa-classes-DFA-1.0.0.0.jar and /dev/null differ diff --git a/clearing-classes/target/maven-archiver/pom.properties b/clearing-classes/target/maven-archiver/pom.properties deleted file mode 100644 index 57b18811d..000000000 --- a/clearing-classes/target/maven-archiver/pom.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Created by Apache Maven 3.6.3 -groupId=ru.spcex.clearing -artifactId=clearing-classes -version=SPCEX-1.0.0.0 diff --git a/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index f347cacf4..000000000 --- a/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,13 +0,0 @@ -ru\clearing\classes\StaticData\Company\CompanyRoleSet.class -ru\clearing\classes\StaticData\Company\CompanySymbols.class -ru\clearing\common\interfaces\WithId.class -ru\clearing\classes\objects\BusinessObject.class -ru\clearing\classes\StaticData\Profile\CompanyInfo.class -ru\clearing\classes\StaticData\Profile\Contact.class -ru\clearing\classes\objects\ObjectBase.class -ru\clearing\classes\ConstSerializable.class -ru\clearing\classes\StaticData\Profile\ProfileDocument.class -ru\clearing\classes\objects\BusinessEvent.class -ru\clearing\classes\StaticData\Company\Company.class -ru\clearing\classes\StaticData\User\ClearingUser.class -ru\clearing\classes\StaticData\Company\CompanyUpdate.class diff --git a/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 50e2706e2..000000000 --- a/clearing-classes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,8 +0,0 @@ -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\StaticData\User\ClearingUser.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\objects\ObjectBase.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\ConstSerializable.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\StaticData\Company\Company.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\objects\BusinessEvent.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\objects\BusinessObject.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\classes\StaticData\Company\CompanyRoleSet.java -E:\MFD_GIT_REPO\clearing\clearing-classes\src\main\java\ru\clearing\common\interfaces\WithId.java diff --git a/clearing-dictionary/CHANGELOG.md b/clearing-dictionary/CHANGELOG.md deleted file mode 100644 index 5453895a1..000000000 --- a/clearing-dictionary/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -1.0.0 ------------------------------- -- \ No newline at end of file diff --git a/frontendapi/pom.xml b/clearing-parent/backend-api/pom.xml similarity index 94% rename from frontendapi/pom.xml rename to clearing-parent/backend-api/pom.xml index f1c5f45ce..63f151bbc 100644 --- a/frontendapi/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -3,16 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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}