diff --git a/.dx/sources.yml b/.dx/codebase.yml similarity index 94% rename from .dx/sources.yml rename to .dx/codebase.yml index 6d9fcc91..a85f2963 100644 --- a/.dx/sources.yml +++ b/.dx/codebase.yml @@ -10,7 +10,7 @@ --no-snapshot-updates --batch-mode {% if focus == 'solution' %} - --projects apps/foo + --projects apps/sepuling {% elif focus == 'pipeline' %} --projects tests/e2e {% endif %} @@ -30,7 +30,7 @@ # list all top level playbooks cmd: > ansible-lint - sources.yml + codebase.yml stacks.yml strip_empty_ends: false changed_when: false diff --git a/.dx/group_vars/all.yml b/.dx/group_vars/all.yml index 55e7fac3..b512f4df 100644 --- a/.dx/group_vars/all.yml +++ b/.dx/group_vars/all.yml @@ -7,14 +7,14 @@ prefs: turing lib_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs')[:7] }}" lib_cids: - signatures: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/signatures')[:7] }}" - storage: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/storage')[:7] }}" + abstraction: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/abstraction')[:7] }}" essentials: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/essentials')[:7] }}" messaging: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/messaging')[:7] }}" + storage: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/storage')[:7] }}" testing: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/testing')[:7] }}" app_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps')[:7] }}" app_cids: - foo: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/foo')[:7] }}" + sepuling: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=apps/sepuling')[:7] }}" schema_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas')[:7] }}" schema_cids: postgres: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=schemas/postgres')[:7] }}" @@ -34,14 +34,14 @@ pipeline_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.githu # solution - focus on solution changes # pipeline - focus on pipeline changes -# none - without any particular focus -focus: none +# null - without any particular focus +focus: null binary_repo: local image_repo: local app_images: - foo: "{{ image_repo }}/{{ organization }}/{{ project }}/app/foo" + sepuling: "{{ image_repo }}/{{ organization }}/{{ project }}/app/sepuling" schema_images: postgres: "{{ image_repo }}/{{ organization }}/{{ project }}/schema/postgres" stack_images: @@ -51,4 +51,4 @@ stack_images: docker_entity: "{{ 'image' if image_repo == 'local' else 'manifest' }}" app_deps: - foo: [essentials, signatures, messaging, storage] + sepuling: [abstraction, essentials, messaging, storage] diff --git a/.dx/tasks/solution/build.yml b/.dx/tasks/solution/build.yml index d257d1ef..7228e29e 100644 --- a/.dx/tasks/solution/build.yml +++ b/.dx/tasks/solution/build.yml @@ -21,8 +21,8 @@ ansible.builtin.command: cmd: > docker compose - --file basis/compose.yml - --file {{ usage }}/compose.yml + --file usages/basis.yml + --file usages/{{ usage }}.yml --profile {{ prefs }} config --output target/context/compose.yml @@ -32,8 +32,8 @@ environment: SCHEMA_TAG: "{{ schema_cids.postgres }}" SCHEMA_IMAGE: "{{ schema_images.postgres }}" - FOO_TAG: "{{ hostvars.app.image_cids.foo[:7] }}" - FOO_IMAGE: "{{ app_images.foo }}" + SEPULING_TAG: "{{ hostvars.app.image_cids.sepuling[:7] }}" + SEPULING_IMAGE: "{{ app_images.sepuling }}" CONFIG_FILE_NAME: "{{ config_files[prefs] }}" CONFIG_MAPPING_MODE: "{{ config_mapping_modes[prefs] }}" changed_when: true @@ -45,7 +45,7 @@ church: conf ansible.builtin.command: cmd: > - cp basis/{{ prefs }}.{{ config_extensions[prefs] }} + cp prefs/{{ prefs }}.{{ config_extensions[prefs] }} target/context/application.{{ config_extensions[prefs] }} chdir: "{{ playbook_dir }}/../solutions" changed_when: true diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 991e349a..3636331f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,7 +19,7 @@ updates: schedule: interval: "weekly" - package-ecosystem: "docker" - directory: "/apps/foo" + directory: "/apps/sepuling" schedule: interval: "weekly" - package-ecosystem: "pip" diff --git a/.github/workflows/pipeline-beyond-doubt.yml b/.github/workflows/pipeline-beyond-doubt.yml index f2b2ca34..1b71585b 100644 --- a/.github/workflows/pipeline-beyond-doubt.yml +++ b/.github/workflows/pipeline-beyond-doubt.yml @@ -29,7 +29,7 @@ jobs: name: ${{ matrix.environ.name }} tools: python java docker token: ${{ secrets.GITHUB_TOKEN }} - - run: ansible-playbook sources.yml -e focus=pipeline + - run: ansible-playbook codebase.yml -e focus=pipeline working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/.github/workflows/pipeline-sanity.yml b/.github/workflows/pipeline-sanity.yml index a74d1beb..2dd721f4 100644 --- a/.github/workflows/pipeline-sanity.yml +++ b/.github/workflows/pipeline-sanity.yml @@ -30,7 +30,7 @@ jobs: with: revision: ${{ matrix.environ.name }} tools: python java - - run: ansible-playbook sources.yml -e focus=pipeline + - run: ansible-playbook codebase.yml -e focus=pipeline working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/.github/workflows/solution-beyond-doubt.yml b/.github/workflows/solution-beyond-doubt.yml index 27ae8c31..2cb40549 100644 --- a/.github/workflows/solution-beyond-doubt.yml +++ b/.github/workflows/solution-beyond-doubt.yml @@ -25,7 +25,7 @@ jobs: with: tools: python java docker token: ${{ secrets.GITHUB_TOKEN }} - - run: ansible-playbook sources.yml -e focus=solution + - run: ansible-playbook codebase.yml -e focus=solution working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml index 6cafd2b7..7c2927e0 100644 --- a/.github/workflows/solution-convincing.yml +++ b/.github/workflows/solution-convincing.yml @@ -26,7 +26,7 @@ jobs: with: tools: python java docker token: ${{ secrets.GITHUB_TOKEN }} - - run: ansible-playbook sources.yml -e focus=solution + - run: ansible-playbook codebase.yml -e focus=solution working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/.github/workflows/solution-sanity.yml b/.github/workflows/solution-sanity.yml index e739b72d..b48e2550 100644 --- a/.github/workflows/solution-sanity.yml +++ b/.github/workflows/solution-sanity.yml @@ -25,7 +25,7 @@ jobs: - uses: ./.github/actions/prepare with: tools: python java - - run: ansible-playbook sources.yml -e focus=solution + - run: ansible-playbook codebase.yml -e focus=solution working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/apps/pom.xml b/apps/pom.xml index a6f4967b..b04e85aa 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -11,7 +11,7 @@ ${revision} - foo + sepuling diff --git a/apps/foo/Dockerfile b/apps/sepuling/Dockerfile similarity index 91% rename from apps/foo/Dockerfile rename to apps/sepuling/Dockerfile index dd8c1887..8604baea 100644 --- a/apps/foo/Dockerfile +++ b/apps/sepuling/Dockerfile @@ -3,7 +3,7 @@ RUN addgroup -S bezmen && adduser -S bezmen -G bezmen USER bezmen:bezmen WORKDIR /home/bezmen COPY libs libs -COPY app*.jar app.jar +COPY sepuling*.jar app.jar ENTRYPOINT [ \ "java", "-cp", "app.jar:libs/*", \ "-Dconfig.file=application.conf", \ diff --git a/apps/foo/pom.xml b/apps/sepuling/pom.xml similarity index 98% rename from apps/foo/pom.xml rename to apps/sepuling/pom.xml index 62fe4ea1..cdda54e9 100644 --- a/apps/foo/pom.xml +++ b/apps/sepuling/pom.xml @@ -10,7 +10,7 @@ ${revision} - app-foo + sepuling diff --git a/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java b/apps/sepuling/src/main/java/smecalculus/bezmen/construction/App.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/construction/App.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/construction/App.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/core/SepulkaConverterImpl.java b/apps/sepuling/src/main/java/smecalculus/bezmen/core/SepulkaConverterImpl.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/core/SepulkaConverterImpl.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/core/SepulkaConverterImpl.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java b/apps/sepuling/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaClientImpl.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaMsgMapper.java b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaMsgMapper.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaMsgMapper.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaMsgMapper.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaRegReqMsg.java b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaRegReqMsg.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaRegReqMsg.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaRegReqMsg.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaRegResMsg.java b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaRegResMsg.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/messaging/SepulkaRegResMsg.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/messaging/SepulkaRegResMsg.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java similarity index 91% rename from apps/foo/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java index 44cef518..361e030b 100644 --- a/apps/foo/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java +++ b/apps/sepuling/src/main/java/smecalculus/bezmen/messaging/springmvc/SepulkaController.java @@ -22,6 +22,7 @@ public record SepulkaController( @PostMapping ResponseEntity register(@RequestBody SepulkaRegReqMsg sepulkaRegReqMsg) { + // TODO: контроллер отвечает только за сборку msg-модели и валидацию validator.validate(sepulkaRegReqMsg); SepulkaRegReq sepulkaRegReq = mapper.toDomain(sepulkaRegReqMsg); SepulkaRegRes sepulkaRegRes = client.register(sepulkaRegReq); diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaRec.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRec.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaRec.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRec.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaRecMapper.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRecMapper.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/SepulkaRecMapper.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRecMapper.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java diff --git a/apps/foo/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java b/apps/sepuling/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java similarity index 100% rename from apps/foo/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java rename to apps/sepuling/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java diff --git a/apps/foo/src/main/resources/application.properties b/apps/sepuling/src/main/resources/application.properties similarity index 100% rename from apps/foo/src/main/resources/application.properties rename to apps/sepuling/src/main/resources/application.properties diff --git a/apps/foo/src/main/resources/reference.conf b/apps/sepuling/src/main/resources/reference.conf similarity index 100% rename from apps/foo/src/main/resources/reference.conf rename to apps/sepuling/src/main/resources/reference.conf diff --git a/apps/foo/src/test/java/smecalculus/bezmen/construction/SepulkaClientBeans.java b/apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaClientBeans.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/construction/SepulkaClientBeans.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaClientBeans.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java b/apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java similarity index 96% rename from apps/foo/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java index 23dfbee7..74305fd5 100644 --- a/apps/foo/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java +++ b/apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java @@ -43,8 +43,8 @@ public DataSource dataSource(StorageProps storageProps) { return new EmbeddedDatabaseBuilder() .setType(EmbeddedDatabaseType.H2) .setName(nameWithSettings) - .addScript("/schemas/alfa/drop.sql") - .addScript("/schemas/alfa/create.sql") + .addScript("/schemas/sepulkarium/drop.sql") + .addScript("/schemas/sepulkarium/create.sql") .build(); } diff --git a/apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientIT.java b/apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientIT.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientIT.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientIT.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWeb.java b/apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWeb.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWeb.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWeb.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebIT.java b/apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebIT.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebIT.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/messaging/SepulkaClientSpringWebIT.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java b/apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java similarity index 96% rename from apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java index 511bbae8..607d1cda 100644 --- a/apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java +++ b/apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java @@ -14,7 +14,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = SepulkaDaoBeans.class) -@Sql("/schemas/alfa/truncate.sql") +@Sql("/schemas/sepulkarium/truncate.sql") abstract class SepulkaDaoIT { @Autowired diff --git a/apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java b/apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisPostgresIT.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisTest.java b/apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisTest.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisTest.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoMyBatisTest.java diff --git a/apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java b/apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java similarity index 100% rename from apps/foo/src/test/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java rename to apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoSpringDataPostgresIT.java diff --git a/apps/foo/src/test/resources/logback-test.xml b/apps/sepuling/src/test/resources/logback-test.xml similarity index 100% rename from apps/foo/src/test/resources/logback-test.xml rename to apps/sepuling/src/test/resources/logback-test.xml diff --git a/docs/pipeline.adoc b/docs/pipeline.adoc index 2286dec7..881a60dd 100644 --- a/docs/pipeline.adoc +++ b/docs/pipeline.adoc @@ -6,7 +6,7 @@ Решение (solution) - система, реализуемая для клиентов. Конвейер (pipeline) - система, реализуемая для разработчиков. Единый интерфейс для локальной разработки и непрерывной интеграции:: -Семантика интерфейса подразумевает набор предопределенных абстракций, артефакты которых последовательно конструируются в ходе сборки. Перед началом конструирования выполняются обязательные проверки. Примеры абстракций: исходники (sources), бинарники (binaries), образы (images), стеки (stacks) и другие. +Семантика интерфейса подразумевает набор предопределенных абстракций, артефакты которых последовательно конструируются в ходе сборки. Перед началом конструирования выполняются обязательные проверки. Примеры абстракций: кодовая база (codebase), бинарники (binaries), образы (images), стеки (stacks) и другие. Контентная адресация (aka идентификация по содержимому):: Контентная адресация (content addressability) делает конструирование *идемпотентным*. Для директорий с исходным кодом вычисляются их контентные идентификаторы (CID's). Затем вычисляются корневые идентификаторы решения и конвейера. Таким образом формируется 2 небольших дерева Меркла, хеши которых подставляются в качестве тегов/классификаторов артефактов соответствующих абстракций. Артефакт конструируется, только когда его контентный идентификатор меняется. diff --git a/libs/signatures/pom.xml b/libs/abstraction/pom.xml similarity index 97% rename from libs/signatures/pom.xml rename to libs/abstraction/pom.xml index cf531994..2903da8f 100644 --- a/libs/signatures/pom.xml +++ b/libs/abstraction/pom.xml @@ -10,7 +10,7 @@ ${revision} - signatures + abstraction false diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/configuration/ConfigKeeper.java b/libs/abstraction/src/main/java/smecalculus/bezmen/configuration/ConfigKeeper.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/configuration/ConfigKeeper.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/configuration/ConfigKeeper.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/core/Sepulka.java b/libs/abstraction/src/main/java/smecalculus/bezmen/core/Sepulka.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/core/Sepulka.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/core/Sepulka.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java b/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaConverter.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaEg.java b/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaEg.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaEg.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaEg.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaService.java b/libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/core/SepulkaService.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/core/SepulkaService.java diff --git a/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java new file mode 100644 index 00000000..62983b86 --- /dev/null +++ b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java @@ -0,0 +1,3 @@ +package smecalculus.bezmen.messaging.client; + +public interface BezmenClient extends SepulingClient {} diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/FooClient.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulingClient.java similarity index 59% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/FooClient.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulingClient.java index 040e344d..27624ee8 100644 --- a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/FooClient.java +++ b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulingClient.java @@ -1,5 +1,5 @@ package smecalculus.bezmen.messaging.client; -interface FooClient extends SepulkaClient { +interface SepulingClient extends SepulkaClient { boolean isReady(); } diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaClient.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaClient.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaClient.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaClient.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReq.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReq.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReq.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReq.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReqEg.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReqEg.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReqEg.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegReqEg.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegRes.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegRes.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegRes.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegRes.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegResEg.java b/libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegResEg.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegResEg.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/messaging/client/SepulkaRegResEg.java diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java b/libs/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java similarity index 100% rename from libs/signatures/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java rename to libs/abstraction/src/main/java/smecalculus/bezmen/validation/EdgeValidator.java diff --git a/libs/essentials/pom.xml b/libs/essentials/pom.xml index 24ef9ed8..0a4baa43 100644 --- a/libs/essentials/pom.xml +++ b/libs/essentials/pom.xml @@ -16,7 +16,7 @@ ${project.groupId} - signatures + abstraction org.jetbrains.kotlin @@ -42,11 +42,6 @@ org.yaml snakeyaml - - org.springframework.boot - spring-boot - true - org.slf4j @@ -66,6 +61,10 @@ org.springframework spring-context + + org.springframework.boot + spring-boot + org.jetbrains.kotlin kotlin-reflect diff --git a/libs/messaging/pom.xml b/libs/messaging/pom.xml index d04b4760..95b3c924 100644 --- a/libs/messaging/pom.xml +++ b/libs/messaging/pom.xml @@ -61,10 +61,6 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - - org.springframework.boot - spring-boot-autoconfigure - diff --git a/libs/pom.xml b/libs/pom.xml index db57bf70..09ac00df 100644 --- a/libs/pom.xml +++ b/libs/pom.xml @@ -11,7 +11,7 @@ ${revision} - signatures + abstraction essentials messaging storage @@ -59,12 +59,12 @@ ${project.groupId} - signatures + abstraction ${project.version} ${project.groupId} - signatures + abstraction ${project.version} client diff --git a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java b/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java deleted file mode 100644 index d9defd2a..00000000 --- a/libs/signatures/src/main/java/smecalculus/bezmen/messaging/client/BezmenClient.java +++ /dev/null @@ -1,3 +0,0 @@ -package smecalculus.bezmen.messaging.client; - -public interface BezmenClient extends FooClient {} diff --git a/libs/testing/pom.xml b/libs/testing/pom.xml index 76063572..83ce4b79 100644 --- a/libs/testing/pom.xml +++ b/libs/testing/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - signatures + abstraction client @@ -49,10 +49,6 @@ org.springframework spring-webflux - - org.springframework.boot - spring-boot - org.junit.jupiter @@ -86,7 +82,7 @@ ${project.basedir}/../../schemas/h2 schemas - alfa/** + sepulkarium/** diff --git a/libs/testing/src/main/java/smecalculus/bezmen/construction/TestingBeans.java b/libs/testing/src/main/java/smecalculus/bezmen/construction/TestingBeans.java index 0b2f1f5f..435fe674 100644 --- a/libs/testing/src/main/java/smecalculus/bezmen/construction/TestingBeans.java +++ b/libs/testing/src/main/java/smecalculus/bezmen/construction/TestingBeans.java @@ -15,8 +15,8 @@ public DataSource dataSource() { return new EmbeddedDatabaseBuilder() .setType(H2) .setName("testdb;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;CASE_INSENSITIVE_IDENTIFIERS=true") - .addScript("schemas/alfa/wipe.sql") - .addScript("schemas/alfa/schema.sql") + .addScript("schemas/sepulkarium/wipe.sql") + .addScript("schemas/sepulkarium/schema.sql") .build(); } } diff --git a/schemas/h2/alfa/create.sql b/schemas/h2/sepulkarium/create.sql similarity index 100% rename from schemas/h2/alfa/create.sql rename to schemas/h2/sepulkarium/create.sql diff --git a/schemas/h2/alfa/drop.sql b/schemas/h2/sepulkarium/drop.sql similarity index 100% rename from schemas/h2/alfa/drop.sql rename to schemas/h2/sepulkarium/drop.sql diff --git a/schemas/h2/alfa/truncate.sql b/schemas/h2/sepulkarium/truncate.sql similarity index 100% rename from schemas/h2/alfa/truncate.sql rename to schemas/h2/sepulkarium/truncate.sql diff --git a/schemas/postgres/alfa/dba/changelog.yml b/schemas/postgres/sepulkarium/dba/changelog.yml similarity index 100% rename from schemas/postgres/alfa/dba/changelog.yml rename to schemas/postgres/sepulkarium/dba/changelog.yml diff --git a/schemas/postgres/alfa/dba/database.sql b/schemas/postgres/sepulkarium/dba/database.sql similarity index 100% rename from schemas/postgres/alfa/dba/database.sql rename to schemas/postgres/sepulkarium/dba/database.sql diff --git a/schemas/postgres/alfa/dba/schema.sql b/schemas/postgres/sepulkarium/dba/schema.sql similarity index 100% rename from schemas/postgres/alfa/dba/schema.sql rename to schemas/postgres/sepulkarium/dba/schema.sql diff --git a/schemas/postgres/alfa/dba/user.sql b/schemas/postgres/sepulkarium/dba/user.sql similarity index 100% rename from schemas/postgres/alfa/dba/user.sql rename to schemas/postgres/sepulkarium/dba/user.sql diff --git a/schemas/postgres/alfa/owner/changelog.yml b/schemas/postgres/sepulkarium/owner/changelog.yml similarity index 100% rename from schemas/postgres/alfa/owner/changelog.yml rename to schemas/postgres/sepulkarium/owner/changelog.yml diff --git a/schemas/postgres/alfa/owner/sepulkas.sql b/schemas/postgres/sepulkarium/owner/sepulkas.sql similarity index 100% rename from schemas/postgres/alfa/owner/sepulkas.sql rename to schemas/postgres/sepulkarium/owner/sepulkas.sql diff --git a/solutions/basis/church.conf b/solutions/prefs/church.conf similarity index 100% rename from solutions/basis/church.conf rename to solutions/prefs/church.conf diff --git a/solutions/basis/turing.yaml b/solutions/prefs/turing.yaml similarity index 100% rename from solutions/basis/turing.yaml rename to solutions/prefs/turing.yaml diff --git a/solutions/basis/compose.yml b/solutions/usages/basis.yml similarity index 89% rename from solutions/basis/compose.yml rename to solutions/usages/basis.yml index c42bae8a..0a9ce0df 100644 --- a/solutions/basis/compose.yml +++ b/solutions/usages/basis.yml @@ -43,7 +43,7 @@ services: image.name: ${SCHEMA_IMAGE} command: > --show-banner=false - --changelog-file=alfa/dba/changelog.yml + --changelog-file=sepulkarium/dba/changelog.yml --url=jdbc:postgresql://db:5432/bezmen?currentSchema=public --liquibase-schema-name=public --username=postgres @@ -69,7 +69,7 @@ services: image.name: ${SCHEMA_IMAGE} command: > --show-banner=false - --changelog-file=alfa/owner/changelog.yml + --changelog-file=sepulkarium/owner/changelog.yml --url=jdbc:postgresql://db:5432/bezmen?currentSchema=bezmen --liquibase-schema-name=bezmen --username=bezmen @@ -78,9 +78,9 @@ services: networks: bezmen: null - foo: - image: ${FOO_IMAGE}:${FOO_TAG} - container_name: app-foo + sepuling: + image: ${SEPULING_IMAGE}:${SEPULING_TAG} + container_name: sepuling ports: - 8080:8080 configs: @@ -93,6 +93,6 @@ services: schema-owner: condition: service_completed_successfully labels: - image.name: ${FOO_IMAGE} + image.name: ${SEPULING_IMAGE} networks: bezmen: null diff --git a/solutions/func/compose.yml b/solutions/usages/func.yml similarity index 100% rename from solutions/func/compose.yml rename to solutions/usages/func.yml diff --git a/solutions/toy/compose.yml b/solutions/usages/toy.yml similarity index 100% rename from solutions/toy/compose.yml rename to solutions/usages/toy.yml