diff --git a/.dx/binaries.yml b/.dx/binaries.yml index de3c24a2..59837e37 100644 --- a/.dx/binaries.yml +++ b/.dx/binaries.yml @@ -1,71 +1,36 @@ --- -- name: Binaries - hosts: lib - run_once: true - tasks: - - name: Capture status - ansible.builtin.command: - # todo: try to implement more lightweight check - cmd: > - mvn - {% if binary_repo == 'local' %} - --offline - {% else %} - --define remoteRepositories=github::::https://{{ binary_repo }}/smecalculus/bezmen - {% endif %} - dependency:get - --define transitive=false - --define artifact=org.smecalculus.bezmen:libs:{{ lib_version }}:pom - chdir: "{{ playbook_dir }}/../libs" - register: binary_status - changed_when: binary_status.rc != 0 - failed_when: false - - name: Status command - ansible.builtin.debug: - msg: "{{ binary_status.cmd|join(' ') }}" - when: binary_status is changed - - name: Create binaries - ansible.builtin.command: - cmd: > - mvn - --no-snapshot-updates - --fail-fast - --batch-mode - --threads 1C - clean - {% if focus == 'solution' %} - deploy - {% else %} - install - {% endif %} - --define revision={{ lib_version }} - chdir: "{{ playbook_dir }}/../libs" - changed_when: true - when: binary_status is changed - - name: Binaries hosts: app run_once: true tasks: - - name: Capture cid + - name: Capture cid's ansible.builtin.command: cmd: git hash-object --stdin stdin: | - {{ lib_cid }} - {{ app_cid }} + {{ app_cids[app] }} + {% for lib in app_deps[app] %} + {{ lib_cids[lib] }} + {% endfor %} # TODO: try to choose better name register: image_cid changed_when: false + loop: "{{ app_images.keys() }}" + loop_control: + loop_var: app + tags: [always] + - name: Declare cid's + ansible.builtin.set_fact: + image_cids: "{{ image_cid.results|items2dict(key_name='app', value_name='stdout') }}" tags: [always] - name: Capture statuses ansible.builtin.command: - cmd: docker {{ docker_entity }} inspect {{ item.value }}:{{ image_cid.stdout[:7] }} + cmd: docker {{ docker_entity }} inspect {{ app_images[app] }}:{{ image_cids[app][:7] }} register: image_status changed_when: image_status.rc != 0 failed_when: false - loop: "{{ app_images|dict2items }}" + loop: "{{ image_cids.keys() }}" loop_control: - label: "{{ item.key }}" + loop_var: app tags: [always] - name: Status commands ansible.builtin.debug: @@ -80,18 +45,21 @@ --fail-fast --batch-mode --threads 1C - {% if not hostvars.lib.binary_status|default({}) is changed %} - --projects {{ image_status.results|select('changed')|map(attribute='item.key')|join(',') }} - {% endif %} + --projects {{ + image_status.results + | select('changed') + | map(attribute='app') + | map('regex_replace', '^', 'apps/') + | join(',') + }} + --also-make clean - {% if up_to_images|default(false) %} - verify + {% if focus == 'solution' and up_to_images|default(false) %} + deploy {% else %} package {% endif %} - --define revision={{ app_version }} - --define lib.version={{ lib_version }} - chdir: "{{ playbook_dir }}/../apps" + chdir: "{{ playbook_dir }}/.." strip_empty_ends: false changed_when: true when: image_status is changed @@ -106,10 +74,11 @@ mvn --no-snapshot-updates --batch-mode + --projects tools,tests + --also-make clean - test-compile - --define lib.version={{ lib_version }} - chdir: "{{ playbook_dir }}/../tests" + package + chdir: "{{ playbook_dir }}/.." strip_empty_ends: false changed_when: true - when: hostvars.lib.binary_status|default({}) is changed + when: focus == 'pipeline' diff --git a/.dx/group_vars/all.yml b/.dx/group_vars/all.yml index 432a2077..325ac3f2 100644 --- a/.dx/group_vars/all.yml +++ b/.dx/group_vars/all.yml @@ -6,8 +6,19 @@ usage: toy prefs: turing lib_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs')[:7] }}" +lib_cids: + client: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/client')[:7] }}" + construction: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/construction')[:7] }}" + data: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=libs/data')[: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] }}" + 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 rev-parse HEAD:apps/foo')[: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] }}" solution_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=solutions')[:7] }}" lib_version: 0.1.0-{{ lib_cid }} @@ -18,7 +29,7 @@ test_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tests')[:7 environ: green dx_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.dx')[:7] }}" -tool_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.tools')[:7] }}" +tool_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=tools')[:7] }}" environ_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.environs/' ~ environ)[:7] }}" pipeline_cid: "{{ lookup('ansible.builtin.pipe', 'git write-tree --prefix=.github')[:7] }}" @@ -32,12 +43,13 @@ image_repo: local app_images: foo: "{{ image_repo }}/{{ organization }}/{{ project }}/app/foo" - schema_images: postgres: "{{ image_repo }}/{{ organization }}/{{ project }}/schema/postgres" - stack_images: solution: "{{ image_repo }}/{{ organization }}/{{ project }}/stack/solution-{{ usage }}-{{ prefs }}" pipeline: "{{ image_repo }}/{{ organization }}/{{ project }}/stack/pipeline-{{ environ }}" docker_entity: "{{ 'image' if image_repo == 'local' else 'manifest' }}" + +app_deps: + foo: [essentials, construction, client, messaging, data] diff --git a/.dx/images.yml b/.dx/images.yml index 9bf2762a..0a238794 100644 --- a/.dx/images.yml +++ b/.dx/images.yml @@ -10,13 +10,13 @@ tasks: - name: Capture statuses ansible.builtin.command: - cmd: docker {{ docker_entity }} inspect {{ item.value }}:{{ schema_cid }} + cmd: docker {{ docker_entity }} inspect {{ schema_images[schema] }}:{{ schema_cids[schema] }} register: image_status changed_when: image_status.rc != 0 failed_when: false - loop: "{{ schema_images|dict2items }}" + loop: "{{ schema_images.keys() }}" loop_control: - label: "{{ item.key }}" + loop_var: schema - name: Status commands ansible.builtin.debug: msg: "{{ image_status.results|map(attribute='cmd')|map('join', ' ') }}" @@ -25,11 +25,13 @@ ansible.builtin.include_role: name: image vars: - image_tag: "{{ schema_cid }}" - image_name: "{{ item.value }}" - image_home: "{{ playbook_dir }}/../schemas/{{ item.key }}" + image_tag: "{{ schema_cids[schema] }}" + image_name: "{{ schema_images[schema] }}" + image_home: "{{ playbook_dir }}/../schemas/{{ schema }}" image_push: "{{ focus == 'solution' }}" - loop: "{{ image_status.results|select('changed')|map(attribute='item') }}" + loop: "{{ image_status.results|select('changed')|map(attribute='schema') }}" + loop_control: + loop_var: schema - name: Images hosts: app @@ -43,7 +45,7 @@ --batch-mode clean antrun:run@coverage - chdir: "{{ playbook_dir }}/../.tools" + chdir: "{{ playbook_dir }}/../tools" strip_empty_ends: false changed_when: true when: image_status is changed @@ -51,10 +53,12 @@ ansible.builtin.include_role: name: image vars: - image_tag: "{{ image_cid.stdout[:7] }}" - image_name: "{{ item.value }}" - image_home: "{{ playbook_dir }}/../apps/{{ item.key }}" + image_tag: "{{ image_cids[app][:7] }}" + image_name: "{{ app_images[app] }}" + image_home: "{{ playbook_dir }}/../apps/{{ app }}" image_context: target/docker-context image_push: "{{ focus == 'solution' }}" - loop: "{{ image_status.results|select('changed')|map(attribute='item') }}" + loop: "{{ image_status.results|select('changed')|map(attribute='app') }}" + loop_control: + loop_var: app when: image_status is changed diff --git a/.dx/inventory/aliases.yml b/.dx/inventory/aliases.yml index 7b30e649..248d598d 100644 --- a/.dx/inventory/aliases.yml +++ b/.dx/inventory/aliases.yml @@ -1,11 +1,16 @@ --- all: hosts: - lib: app: schema: test: - dx: + vars: + ansible_connection: local +codebase: + hosts: + java: + ansible: + github: vars: ansible_connection: local stack: diff --git a/.dx/sources.yml b/.dx/sources.yml index 616afa7f..6d9fcc91 100644 --- a/.dx/sources.yml +++ b/.dx/sources.yml @@ -1,6 +1,6 @@ --- -- name: Sources - hosts: lib +- name: Codebase + hosts: java run_once: true tasks: - name: Analyze @@ -9,44 +9,20 @@ mvn --no-snapshot-updates --batch-mode + {% if focus == 'solution' %} + --projects apps/foo + {% elif focus == 'pipeline' %} + --projects tests/e2e + {% endif %} + --also-make enforcer:enforce spotless:check - chdir: "{{ playbook_dir }}/../libs" + chdir: "{{ playbook_dir }}/.." strip_empty_ends: false changed_when: false -- name: Sources - hosts: app - run_once: true - tasks: - - name: Analyze - ansible.builtin.command: - cmd: > - mvn - --no-snapshot-updates - --batch-mode - spotless:check - chdir: "{{ playbook_dir }}/../apps" - strip_empty_ends: false - changed_when: false - -- name: Sources - hosts: test - run_once: true - tasks: - - name: Analyze - ansible.builtin.command: - cmd: > - mvn - --no-snapshot-updates - --batch-mode - spotless:check - chdir: "{{ playbook_dir }}/../tests" - strip_empty_ends: false - changed_when: false - -- name: Sources - hosts: pipeline +- name: Codebase + hosts: ansible run_once: true tasks: - name: Analyze @@ -58,8 +34,15 @@ stacks.yml strip_empty_ends: false changed_when: false + when: focus != 'solution' + +- name: Codebase + hosts: github + run_once: true + tasks: - name: Analyze ansible.builtin.command: cmd: yamllint ../.github strip_empty_ends: false changed_when: false + when: focus != 'solution' diff --git a/.dx/tasks/solution/build.yml b/.dx/tasks/solution/build.yml index 06a005b5..899634d4 100644 --- a/.dx/tasks/solution/build.yml +++ b/.dx/tasks/solution/build.yml @@ -23,9 +23,9 @@ strip_empty_ends: false chdir: "{{ playbook_dir }}/../solutions" environment: - SCHEMA_TAG: "{{ schema_cid }}" + SCHEMA_TAG: "{{ schema_cids.postgres }}" SCHEMA_IMAGE: "{{ schema_images.postgres }}" - FOO_TAG: "{{ hostvars.app.image_cid.stdout[:7] }}" + FOO_TAG: "{{ hostvars.app.image_cids.foo[:7] }}" FOO_IMAGE: "{{ app_images.foo }}" changed_when: true diff --git a/.dx/tasks/solution/test.yml b/.dx/tasks/solution/test.yml index d3eaf1cb..c25dbbab 100644 --- a/.dx/tasks/solution/test.yml +++ b/.dx/tasks/solution/test.yml @@ -27,21 +27,23 @@ mvn --no-snapshot-updates --batch-mode - --projects e2e + --threads 1C + --projects tests/e2e --activate-profiles {{ usage }} - --define lib.version={{ lib_version }} + --also-make clean test + --define prefs={{ prefs }} {% if test_failure_ignore is defined %} --define maven.test.failure.ignore={{ test_failure_ignore }} {% endif %} - --define prefs={{ prefs }} {% if reminder is defined %} --define bezmen.sharding.reminder={{ reminder }} {% endif %} {% if modulus is defined %} --define bezmen.sharding.modulus={{ modulus }} {% endif %} - chdir: "{{ playbook_dir }}/../tests" + --define skipUnits=true + chdir: "{{ playbook_dir }}/.." strip_empty_ends: false changed_when: true diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 43cdf913..4b63d548 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,15 +15,15 @@ updates: schedule: interval: "weekly" ignore: - - dependency-name: "org.smecalculus.bezmen:*" + - dependency-name: "smecalculus.bezmen:*" - package-ecosystem: "maven" directory: "/tests" schedule: interval: "weekly" ignore: - - dependency-name: "org.smecalculus.bezmen:*" + - dependency-name: "smecalculus.bezmen:*" - package-ecosystem: "maven" - directory: "/.tools" + directory: "/tools" schedule: interval: "weekly" - package-ecosystem: "docker" diff --git a/.github/workflows/pipeline-beyond-doubt.yml b/.github/workflows/pipeline-beyond-doubt.yml index 47e6db9f..564e1d2d 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 -l test:pipeline + - run: ansible-playbook sources.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 cacba9b4..5aacd859 100644 --- a/.github/workflows/pipeline-sanity.yml +++ b/.github/workflows/pipeline-sanity.yml @@ -7,7 +7,7 @@ on: - main paths: # waiting for https://github.com/actions/runner/issues/2324 - .dx/** - - .tools/** + - tools/** - .environs/** - .github/** workflow_dispatch: @@ -30,7 +30,7 @@ jobs: with: revision: ${{ matrix.environ.name }} tools: python java - - run: ansible-playbook sources.yml -l test:pipeline + - run: ansible-playbook sources.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 c921339e..59a99392 100644 --- a/.github/workflows/solution-beyond-doubt.yml +++ b/.github/workflows/solution-beyond-doubt.yml @@ -12,23 +12,8 @@ env: IMAGE_REPO: ghcr.io jobs: - sources: - name: Sources - timeout-minutes: 5 - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4.0.0 - - uses: ./.github/actions/prepare - with: - tools: python java - - run: ansible-playbook sources.yml -l lib:app - working-directory: .dx - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - binaries-and-images: - name: Binaries & Images + up-to-images: + name: Up to images timeout-minutes: 10 runs-on: ubuntu-22.04 permissions: @@ -40,7 +25,13 @@ jobs: with: tools: python java docker token: ${{ secrets.GITHUB_TOKEN }} - - run: > + - run: ansible-playbook sources.yml -e focus=solution + working-directory: .dx + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - id: images + run: > ansible-playbook images.yml -e binary_repo=${{ env.BINARY_REPO }} -e image_repo=${{ env.IMAGE_REPO }} @@ -49,37 +40,27 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 - if: ${{ !cancelled() }} + - uses: mikepenz/action-junit-report@v4 + if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }} with: check_name: Unit Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "**/target/surefire-reports/TEST-*.xml" + require_tests: "${{ steps.images.outcome == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: | - libs/*/target/surefire-reports/TEST-*.xml - apps/*/target/surefire-reports/TEST-*.xml - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 - if: ${{ !cancelled() }} + - uses: mikepenz/action-junit-report@v4 + if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }} with: check_name: Integration Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "**/target/failsafe-reports/TEST-*.xml" + require_tests: "${{ steps.images.outcome == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: | - libs/*/target/failsafe-reports/TEST-*.xml - apps/*/target/failsafe-reports/TEST-*.xml stack-building: name: Stack building timeout-minutes: 5 - needs: [sources, binaries-and-images] + needs: [up-to-images] strategy: fail-fast: false matrix: @@ -179,7 +160,8 @@ jobs: stack-reporting: name: Stack reporting timeout-minutes: 5 - needs: [stack-packaging] + needs: [stack-testing] + if: ${{ !cancelled() && (needs.stack-testing.result == 'success' || needs.stack-testing.result == 'failure') }} runs-on: ubuntu-22.04 permissions: checks: write @@ -188,13 +170,10 @@ jobs: with: path: artifacts - run: ls -R - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 + - uses: mikepenz/action-junit-report@v4 with: check_name: E2E Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "artifacts/e2e-test-report-*/**/TEST-*.xml" + require_tests: "${{ needs.stack-testing.result == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: artifacts/e2e-test-report-*/**/TEST-*.xml diff --git a/.github/workflows/solution-convincing.yml b/.github/workflows/solution-convincing.yml index ccf9bedb..f9e1af54 100644 --- a/.github/workflows/solution-convincing.yml +++ b/.github/workflows/solution-convincing.yml @@ -26,12 +26,13 @@ jobs: with: tools: python java docker token: ${{ secrets.GITHUB_TOKEN }} - - run: ansible-playbook sources.yml -l lib:app + - run: ansible-playbook sources.yml -e focus=solution working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: > + - id: images + run: > ansible-playbook images.yml -e binary_repo=maven.pkg.github.com -e image_repo=ghcr.io @@ -40,47 +41,33 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 - if: ${{ !cancelled() }} + - uses: mikepenz/action-junit-report@v4 + if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }} with: check_name: Unit Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "**/target/surefire-reports/TEST-*.xml" + require_tests: "${{ steps.images.outcome == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: | - libs/*/target/surefire-reports/TEST-*.xml - apps/*/target/surefire-reports/TEST-*.xml - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 - if: ${{ !cancelled() }} + - uses: mikepenz/action-junit-report@v4 + if: ${{ !cancelled() && (steps.images.outcome == 'success' || steps.images.outcome == 'failure') }} with: check_name: Integration Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "**/target/failsafe-reports/TEST-*.xml" + require_tests: "${{ steps.images.outcome == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: | - libs/*/target/failsafe-reports/TEST-*.xml - apps/*/target/failsafe-reports/TEST-*.xml - name: Always empty E2E test report. See https://github.com/orgs/community/discussions/13690 - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 + uses: mikepenz/action-junit-report@v4 if: ${{ !cancelled() }} with: check_name: E2E Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + require_tests: false + fail_on_failure: false job_summary: false - comment_mode: off - files: tests/*/target/surefire-reports/TEST-*.xml - uses: actions/upload-artifact@v3.1.3 if: ${{ !cancelled() }} with: name: test-coverage-report - path: .tools/target/coverage + path: tools/target/coverage if-no-files-found: ignore diff --git a/.github/workflows/solution-sanity.yml b/.github/workflows/solution-sanity.yml index d2ce0715..cabc4fb9 100644 --- a/.github/workflows/solution-sanity.yml +++ b/.github/workflows/solution-sanity.yml @@ -17,17 +17,21 @@ jobs: name: Up to binaries timeout-minutes: 5 runs-on: ubuntu-22.04 + permissions: + checks: write + packages: write steps: - uses: actions/checkout@v4.0.0 - uses: ./.github/actions/prepare with: tools: python java - - run: ansible-playbook sources.yml -l lib:app + - run: ansible-playbook sources.yml -e focus=solution working-directory: .dx env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: > + - id: binaries + run: > ansible-playbook binaries.yml -e binary_repo=maven.pkg.github.com -e focus=solution @@ -35,16 +39,11 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: EnricoMi/publish-unit-test-result-action@v2.9.0 - if: ${{ !cancelled() }} + - uses: mikepenz/action-junit-report@v4 + if: ${{ !cancelled() && (steps.binaries.outcome == 'success' || steps.binaries.outcome == 'failure') }} with: check_name: Unit Test Report - check_run_annotations: none - compare_to_earlier_commit: false - action_fail_on_inconclusive: true - action_fail: true + report_paths: "**/target/surefire-reports/TEST-*.xml" + require_tests: "${{ steps.binaries.outcome == 'failure' }}" + fail_on_failure: false job_summary: false - comment_mode: off - files: | - libs/*/target/surefire-reports/TEST-*.xml - apps/*/target/surefire-reports/TEST-*.xml diff --git a/README.adoc b/README.adoc index 6e5f3d17..c6bc679f 100644 --- a/README.adoc +++ b/README.adoc @@ -79,7 +79,6 @@ . Параллелизация модульных тестов . Построение дерева хешей (взглянуть критически) . Версионирование библиотек и приложений (взглянуть критически) -. Агрегация отчетов покрытия (взглянуть критически) . Локальные проверки в удаленном репозитории -. Чистка пакетов в удаленном репозитории +. Чистка артефактов в удаленном репозитории . Поддержка нескольких версий Java diff --git a/apps/foo/Dockerfile b/apps/foo/Dockerfile index efc17cbd..942e3d26 100644 --- a/apps/foo/Dockerfile +++ b/apps/foo/Dockerfile @@ -7,5 +7,5 @@ COPY app-foo*.jar foo/app.jar ENTRYPOINT [ \ "java", "-cp", "foo/app.jar:foo/libs/*", \ "-Dconfig.file=foo/application.conf", \ - "org.smecalculus.bezmen.construction.spec.App" \ + "smecalculus.bezmen.construction.spec.App" \ ] diff --git a/apps/foo/pom.xml b/apps/foo/pom.xml index 612b3aa9..684c7715 100644 --- a/apps/foo/pom.xml +++ b/apps/foo/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen apps ${revision} @@ -15,7 +15,7 @@ ${project.groupId} - core + essentials ${project.groupId} @@ -75,21 +75,6 @@ - - analyze - - - org.smecalculus.bezmen:construction - - - org.springframework:spring-beans - org.springframework:spring-jdbc - org.springframework:spring-tx - org.mybatis:mybatis-spring - org.springframework.data:spring-data-jdbc - - - diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java b/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java deleted file mode 100644 index 6c3f53cf..00000000 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.smecalculus.bezmen.messaging.impl; - -import lombok.NonNull; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.service.spec.Sepulka; -import org.smecalculus.bezmen.service.spec.SepulkaConverter; -import org.smecalculus.bezmen.service.spec.SepulkaService; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; - -public record SepulkaClientImpl( - @NonNull BezmenValidator validator, @NonNull SepulkaService service, @NonNull SepulkaConverter converter) - implements SepulkaClient { - - @Override - public SepulkaRegRes register(SepulkaRegReq request) { - validator.validate(request); - Sepulka sepulka = service.register(request); - return converter.toRegRes(sepulka); - } -} diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaConverterImpl.java b/apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaConverterImpl.java deleted file mode 100644 index 76431ef7..00000000 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaConverterImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.smecalculus.bezmen.service.impl; - -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.service.spec.Sepulka; -import org.smecalculus.bezmen.service.spec.SepulkaConverter; - -public class SepulkaConverterImpl implements SepulkaConverter { - public SepulkaRegRes toRegRes(Sepulka sepulka) { - return new SepulkaRegRes(sepulka.id(), sepulka.name()); - } -} diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/construction/spec/App.java b/apps/foo/src/main/java/smecalculus/bezmen/construction/spec/App.java similarity index 75% rename from apps/foo/src/main/java/org/smecalculus/bezmen/construction/spec/App.java rename to apps/foo/src/main/java/smecalculus/bezmen/construction/spec/App.java index e1d7a043..811d40ca 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/construction/spec/App.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/construction/spec/App.java @@ -1,26 +1,9 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; -import static org.smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; +import static smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; +import static smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; +import static smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; -import org.smecalculus.bezmen.data.impl.SepulkaDaoMyBatis; -import org.smecalculus.bezmen.data.impl.SepulkaDaoSpringData; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapper; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapperImpl; -import org.smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; -import org.smecalculus.bezmen.data.spec.springdata.SepulkaRepository; -import org.smecalculus.bezmen.messaging.impl.SepulkaClientImpl; -import org.smecalculus.bezmen.messaging.impl.springmvc.SepulkaController; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapperImpl; -import org.smecalculus.bezmen.service.impl.SepulkaConverterImpl; -import org.smecalculus.bezmen.service.impl.SepulkaServiceImpl; -import org.smecalculus.bezmen.service.spec.SepulkaConverter; -import org.smecalculus.bezmen.service.spec.SepulkaService; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.jdbc.DataSourceHealthContributorAutoConfiguration; @@ -41,6 +24,23 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import smecalculus.bezmen.data.impl.SepulkaDaoMyBatis; +import smecalculus.bezmen.data.impl.SepulkaDaoSpringData; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.data.spec.SepulkaRecMapper; +import smecalculus.bezmen.data.spec.SepulkaRecMapperImpl; +import smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; +import smecalculus.bezmen.data.spec.springdata.SepulkaRepository; +import smecalculus.bezmen.domain.impl.SepulkaConverterImpl; +import smecalculus.bezmen.domain.impl.SepulkaServiceImpl; +import smecalculus.bezmen.domain.spec.SepulkaConverter; +import smecalculus.bezmen.domain.spec.SepulkaService; +import smecalculus.bezmen.messaging.impl.SepulkaClientImpl; +import smecalculus.bezmen.messaging.impl.springmvc.SepulkaController; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapperImpl; +import smecalculus.bezmen.validation.spec.BezmenValidator; @Import({ConfigBeans.class, ValidationBeans.class, MessagingBeans.class, DataBeans.class}) @EnableAutoConfiguration( diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java b/apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java similarity index 70% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java index 4fb936d1..d751e6ee 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java @@ -1,15 +1,15 @@ -package org.smecalculus.bezmen.data.impl; +package smecalculus.bezmen.data.impl; import static java.util.stream.Collectors.toList; import java.util.List; import java.util.UUID; import lombok.NonNull; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.data.spec.SepulkaRec; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapper; -import org.smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; -import org.smecalculus.bezmen.service.spec.Sepulka; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.data.spec.SepulkaRec; +import smecalculus.bezmen.data.spec.SepulkaRecMapper; +import smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; +import smecalculus.bezmen.domain.spec.Sepulka; public record SepulkaDaoMyBatis(@NonNull SepulkaRecMapper recMapper, @NonNull SepulkaSqlMapper sqlMapper) implements SepulkaDao { diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java b/apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java similarity index 73% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java index 7cde4f9d..00f901d4 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.data.impl; +package smecalculus.bezmen.data.impl; import static java.util.stream.Collectors.toList; import static java.util.stream.StreamSupport.stream; @@ -6,11 +6,11 @@ import java.util.List; import java.util.UUID; import lombok.NonNull; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.data.spec.SepulkaRec; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapper; -import org.smecalculus.bezmen.data.spec.springdata.SepulkaRepository; -import org.smecalculus.bezmen.service.spec.Sepulka; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.data.spec.SepulkaRec; +import smecalculus.bezmen.data.spec.SepulkaRecMapper; +import smecalculus.bezmen.data.spec.springdata.SepulkaRepository; +import smecalculus.bezmen.domain.spec.Sepulka; public record SepulkaDaoSpringData(@NonNull SepulkaRecMapper mapper, @NonNull SepulkaRepository repository) implements SepulkaDao { diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaDao.java b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaDao.java similarity index 65% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaDao.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaDao.java index 54433583..3797a17a 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaDao.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaDao.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.data.spec; +package smecalculus.bezmen.data.spec; import java.util.List; import java.util.UUID; -import org.smecalculus.bezmen.service.spec.Sepulka; +import smecalculus.bezmen.domain.spec.Sepulka; public interface SepulkaDao { diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRec.java b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRec.java similarity index 88% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRec.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRec.java index c8f23299..d8047089 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRec.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRec.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.data.spec; +package smecalculus.bezmen.data.spec; import lombok.Data; import org.springframework.data.annotation.Id; diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRecMapper.java b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRecMapper.java similarity index 63% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRecMapper.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRecMapper.java index 71ad6355..397bc5e7 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRecMapper.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/SepulkaRecMapper.java @@ -1,7 +1,7 @@ -package org.smecalculus.bezmen.data.spec; +package smecalculus.bezmen.data.spec; import org.mapstruct.Mapper; -import org.smecalculus.bezmen.service.spec.Sepulka; +import smecalculus.bezmen.domain.spec.Sepulka; @Mapper public interface SepulkaRecMapper { diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java similarity index 84% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java index 57e22e1e..b0900c7b 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.data.spec.mybatis; +package smecalculus.bezmen.data.spec.mybatis; import java.util.List; import java.util.Optional; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.smecalculus.bezmen.data.spec.SepulkaRec; +import smecalculus.bezmen.data.spec.SepulkaRec; public interface SepulkaSqlMapper { diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java similarity index 57% rename from apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java rename to apps/foo/src/main/java/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java index 21c21566..cd052994 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java @@ -1,6 +1,6 @@ -package org.smecalculus.bezmen.data.spec.springdata; +package smecalculus.bezmen.data.spec.springdata; -import org.smecalculus.bezmen.data.spec.SepulkaRec; import org.springframework.data.repository.CrudRepository; +import smecalculus.bezmen.data.spec.SepulkaRec; public interface SepulkaRepository extends CrudRepository {} diff --git a/apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaConverterImpl.java b/apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaConverterImpl.java new file mode 100644 index 00000000..4e78bc0d --- /dev/null +++ b/apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaConverterImpl.java @@ -0,0 +1,11 @@ +package smecalculus.bezmen.domain.impl; + +import smecalculus.bezmen.domain.spec.Sepulka; +import smecalculus.bezmen.domain.spec.SepulkaConverter; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; + +public class SepulkaConverterImpl implements SepulkaConverter { + public SepulkaRegRes toRegRes(Sepulka sepulka) { + return new SepulkaRegRes(sepulka.id(), sepulka.name()); + } +} diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaServiceImpl.java b/apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaServiceImpl.java similarity index 66% rename from apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaServiceImpl.java rename to apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaServiceImpl.java index c56fbd1c..07e7b3d8 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaServiceImpl.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/domain/impl/SepulkaServiceImpl.java @@ -1,13 +1,13 @@ -package org.smecalculus.bezmen.service.impl; +package smecalculus.bezmen.domain.impl; import static java.util.UUID.randomUUID; import java.util.List; import lombok.NonNull; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.service.spec.Sepulka; -import org.smecalculus.bezmen.service.spec.SepulkaService; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.domain.spec.Sepulka; +import smecalculus.bezmen.domain.spec.SepulkaService; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; public record SepulkaServiceImpl(@NonNull SepulkaDao sepulkaDao) implements SepulkaService { diff --git a/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java new file mode 100644 index 00000000..2b288ed7 --- /dev/null +++ b/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/SepulkaClientImpl.java @@ -0,0 +1,22 @@ +package smecalculus.bezmen.messaging.impl; + +import lombok.NonNull; +import smecalculus.bezmen.domain.spec.Sepulka; +import smecalculus.bezmen.domain.spec.SepulkaConverter; +import smecalculus.bezmen.domain.spec.SepulkaService; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; +import smecalculus.bezmen.validation.spec.BezmenValidator; + +public record SepulkaClientImpl( + @NonNull BezmenValidator validator, @NonNull SepulkaService service, @NonNull SepulkaConverter converter) + implements SepulkaClient { + + @Override + public SepulkaRegRes register(SepulkaRegReq request) { + validator.validate(request); + Sepulka sepulka = service.register(request); + return converter.toRegRes(sepulka); + } +} diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java similarity index 65% rename from apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java rename to apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java index 659af3eb..2ea379ac 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java @@ -1,17 +1,17 @@ -package org.smecalculus.bezmen.messaging.impl.springmvc; +package smecalculus.bezmen.messaging.impl.springmvc; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReqMsg; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegResMsg; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegReqMsg; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; +import smecalculus.bezmen.messaging.spec.SepulkaRegResMsg; @RestController @RequestMapping("sepulkas") diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java similarity index 87% rename from apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java rename to apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java index 17cf1197..ef7c827a 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaMsgMapper.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; import org.mapstruct.Mapper; diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java similarity index 64% rename from apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java rename to apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java index d33db48d..2f313be4 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReqMsg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; import lombok.Data; diff --git a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java similarity index 70% rename from apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java rename to apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java index 41bbac26..0629a364 100644 --- a/apps/foo/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java +++ b/apps/foo/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegResMsg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; import lombok.Data; diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java b/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java deleted file mode 100644 index 49475551..00000000 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.smecalculus.bezmen.data.impl; - -import org.junit.jupiter.api.Test; - -class SepulkaDaoMyBatisTest { - - @Test - void foo() { - // empty - } -} diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java b/apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java similarity index 63% rename from apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java rename to apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java index 414b34a3..b8cb1f9f 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaClientBeans.java @@ -1,22 +1,22 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import static org.mockito.Mockito.mock; -import org.smecalculus.bezmen.messaging.impl.SepulkaClientImpl; -import org.smecalculus.bezmen.messaging.impl.SepulkaClientSpringWeb; -import org.smecalculus.bezmen.messaging.impl.springmvc.SepulkaController; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapperImpl; -import org.smecalculus.bezmen.service.impl.SepulkaConverterImpl; -import org.smecalculus.bezmen.service.spec.SepulkaConverter; -import org.smecalculus.bezmen.service.spec.SepulkaService; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.servlet.client.MockMvcWebTestClient; +import smecalculus.bezmen.domain.impl.SepulkaConverterImpl; +import smecalculus.bezmen.domain.spec.SepulkaConverter; +import smecalculus.bezmen.domain.spec.SepulkaService; +import smecalculus.bezmen.messaging.impl.SepulkaClientImpl; +import smecalculus.bezmen.messaging.impl.SepulkaClientSpringWeb; +import smecalculus.bezmen.messaging.impl.springmvc.SepulkaController; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapperImpl; +import smecalculus.bezmen.validation.spec.BezmenValidator; @Import(ValidationBeans.class) @Configuration(proxyBeanMethods = false) diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java b/apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java similarity index 74% rename from apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java rename to apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java index 5e24f019..341fc5d8 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/construction/spec/SepulkaDaoBeans.java @@ -1,28 +1,28 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import static java.util.stream.Collectors.joining; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; -import static org.smecalculus.bezmen.configuration.spec.VendorMode.POSTGRES; +import static smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; +import static smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; +import static smecalculus.bezmen.configuration.spec.VendorMode.POSTGRES; import java.util.Collection; import java.util.List; import java.util.stream.Stream; import javax.sql.DataSource; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.OrmProps; -import org.smecalculus.bezmen.configuration.spec.VendorProps; -import org.smecalculus.bezmen.data.impl.SepulkaDaoMyBatis; -import org.smecalculus.bezmen.data.impl.SepulkaDaoSpringData; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapper; -import org.smecalculus.bezmen.data.spec.SepulkaRecMapperImpl; -import org.smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; -import org.smecalculus.bezmen.data.spec.springdata.SepulkaRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.OrmProps; +import smecalculus.bezmen.configuration.spec.VendorProps; +import smecalculus.bezmen.data.impl.SepulkaDaoMyBatis; +import smecalculus.bezmen.data.impl.SepulkaDaoSpringData; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.data.spec.SepulkaRecMapper; +import smecalculus.bezmen.data.spec.SepulkaRecMapperImpl; +import smecalculus.bezmen.data.spec.mybatis.SepulkaSqlMapper; +import smecalculus.bezmen.data.spec.springdata.SepulkaRepository; @Configuration(proxyBeanMethods = false) public class SepulkaDaoBeans { diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoIT.java b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoIT.java similarity index 78% rename from apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoIT.java rename to apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoIT.java index ec25de3f..775d2cd6 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoIT.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoIT.java @@ -1,17 +1,17 @@ -package org.smecalculus.bezmen.data.impl; +package smecalculus.bezmen.data.impl; import static org.assertj.core.api.Assertions.assertThat; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaBuilder; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.smecalculus.bezmen.construction.spec.SepulkaDaoBeans; -import org.smecalculus.bezmen.data.spec.SepulkaDao; -import org.smecalculus.bezmen.service.spec.Sepulka; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.junit.jupiter.SpringExtension; +import smecalculus.bezmen.construction.spec.SepulkaDaoBeans; +import smecalculus.bezmen.data.spec.SepulkaDao; +import smecalculus.bezmen.domain.spec.Sepulka; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = SepulkaDaoBeans.class) diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java similarity index 56% rename from apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java rename to apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java index 04d1290c..346c42c9 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisPostgresIT.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.data.impl; +package smecalculus.bezmen.data.impl; -import org.smecalculus.bezmen.construction.spec.OrmMyBatisBeans; -import org.smecalculus.bezmen.construction.spec.SepulkaDaoBeans; import org.springframework.test.context.ContextConfiguration; +import smecalculus.bezmen.construction.spec.OrmMyBatisBeans; +import smecalculus.bezmen.construction.spec.SepulkaDaoBeans; @ContextConfiguration(classes = {SepulkaDaoBeans.MyBatisPostgres.class, OrmMyBatisBeans.class}) public class SepulkaDaoMyBatisPostgresIT extends SepulkaDaoIT {} diff --git a/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java new file mode 100644 index 00000000..9e40a23b --- /dev/null +++ b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoMyBatisTest.java @@ -0,0 +1,9 @@ +package smecalculus.bezmen.data.impl; + +import org.junit.jupiter.api.Test; + +class SepulkaDaoMyBatisTest { + + @Test + void foo() {} +} diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java similarity index 57% rename from apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java rename to apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java index f6679901..7d73d151 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringDataPostgresIT.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.data.impl; +package smecalculus.bezmen.data.impl; -import org.smecalculus.bezmen.construction.spec.OrmSpringDataBeans; -import org.smecalculus.bezmen.construction.spec.SepulkaDaoBeans; import org.springframework.test.context.ContextConfiguration; +import smecalculus.bezmen.construction.spec.OrmSpringDataBeans; +import smecalculus.bezmen.construction.spec.SepulkaDaoBeans; @ContextConfiguration(classes = {SepulkaDaoBeans.SpringDataPostgres.class, OrmSpringDataBeans.class}) public class SepulkaDaoSpringDataPostgresIT extends SepulkaDaoIT {} diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java similarity index 69% rename from apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java rename to apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java index 3bdde13e..fb1dc7df 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientIT.java @@ -1,23 +1,23 @@ -package org.smecalculus.bezmen.messaging.impl; +package smecalculus.bezmen.messaging.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaPojo; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegReqPojo; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegResPojo; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaPojo; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegReqPojo; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegResPojo; import java.util.UUID; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.smecalculus.bezmen.construction.spec.SepulkaClientBeans; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.service.spec.SepulkaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; +import smecalculus.bezmen.construction.spec.SepulkaClientBeans; +import smecalculus.bezmen.domain.spec.SepulkaService; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = SepulkaClientBeans.class) diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java similarity index 69% rename from apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java rename to apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java index e3cb53eb..ba032995 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWeb.java @@ -1,13 +1,13 @@ -package org.smecalculus.bezmen.messaging.impl; +package smecalculus.bezmen.messaging.impl; import lombok.NonNull; -import org.smecalculus.bezmen.messaging.spec.SepulkaClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegResMsg; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; +import smecalculus.bezmen.messaging.spec.SepulkaClient; +import smecalculus.bezmen.messaging.spec.SepulkaMsgMapper; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; +import smecalculus.bezmen.messaging.spec.SepulkaRegResMsg; public record SepulkaClientSpringWeb(@NonNull WebTestClient client, @NonNull SepulkaMsgMapper mapper) implements SepulkaClient { diff --git a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java similarity index 58% rename from apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java rename to apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java index d8bb7319..143945c8 100644 --- a/apps/foo/src/test/java/org/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java +++ b/apps/foo/src/test/java/smecalculus/bezmen/messaging/impl/SepulkaClientSpringWebIT.java @@ -1,3 +1,3 @@ -package org.smecalculus.bezmen.messaging.impl; +package smecalculus.bezmen.messaging.impl; public class SepulkaClientSpringWebIT extends SepulkaClientIT {} diff --git a/apps/pom.xml b/apps/pom.xml index d5efc954..d31ce88d 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -6,7 +6,7 @@ pom - org.smecalculus.bezmen + smecalculus.bezmen apps ${revision} @@ -16,7 +16,6 @@ 0.1.0-SNAPSHOT - LATEST 1.18.28 1.5.5.Final false @@ -44,7 +43,7 @@ ${project.groupId} libs - ${lib.version} + 0.1.0-SNAPSHOT pom import @@ -54,7 +53,10 @@ - maven-dependency-plugin + maven-install-plugin + + + maven-deploy-plugin maven-surefire-plugin @@ -74,6 +76,13 @@ + + maven-enforcer-plugin + 3.4.1 + + true + + maven-compiler-plugin 3.11.0 @@ -114,6 +123,20 @@ + + maven-install-plugin + 3.1.1 + + true + + + + maven-deploy-plugin + 3.1.1 + + true + + maven-assembly-plugin 3.6.0 @@ -127,30 +150,6 @@ - - maven-dependency-plugin - 3.6.0 - - - analyze - - analyze-only - - - true - true - true - - org.junit.jupiter:junit-jupiter-engine - - - - *:* - - - - - com.diffplug.spotless spotless-maven-plugin diff --git a/libs/README.adoc b/libs/README.adoc index 75d82c7d..2bc7bf33 100644 --- a/libs/README.adoc +++ b/libs/README.adoc @@ -6,7 +6,7 @@ include::client/README.adoc[] === Core -include::core/README.adoc[] +include::essentials/README.adoc[] === Construction diff --git a/libs/client/pom.xml b/libs/client/pom.xml index 0dc78fcc..202c2092 100644 --- a/libs/client/pom.xml +++ b/libs/client/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} @@ -26,22 +26,4 @@ jakarta.servlet-api - - - - - maven-dependency-plugin - - - analyze - - - jakarta.servlet:jakarta.servlet-api - - - - - - - diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java similarity index 89% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java index 3216bc5c..ade5d268 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/impl/BezmenClientJavaHttp.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.impl; +package smecalculus.bezmen.messaging.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -9,9 +9,9 @@ import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; -import org.smecalculus.bezmen.messaging.spec.BezmenClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; +import smecalculus.bezmen.messaging.spec.BezmenClient; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; public record BezmenClientJavaHttp(ObjectMapper mapper, HttpClient client) implements BezmenClient { diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/BezmenClient.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/BezmenClient.java similarity index 52% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/BezmenClient.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/spec/BezmenClient.java index af90f368..38582db0 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/BezmenClient.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/BezmenClient.java @@ -1,3 +1,3 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; public interface BezmenClient extends FooClient {} diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/FooClient.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/FooClient.java similarity index 59% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/FooClient.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/spec/FooClient.java index 2e014416..ae186410 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/FooClient.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/FooClient.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; interface FooClient extends SepulkaClient { boolean isReady(); diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaClient.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaClient.java similarity index 64% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaClient.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaClient.java index fea8e86d..3be99567 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaClient.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaClient.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; public interface SepulkaClient { SepulkaRegRes register(SepulkaRegReq request); diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java similarity index 62% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java index 197535ae..44179186 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegReq.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; import lombok.NonNull; diff --git a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java similarity index 71% rename from libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java rename to libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java index 69067ba3..aaadb70c 100644 --- a/libs/client/src/main/java/org/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java +++ b/libs/client/src/main/java/smecalculus/bezmen/messaging/spec/SepulkaRegRes.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.messaging.spec; +package smecalculus.bezmen.messaging.spec; import java.util.UUID; import lombok.NonNull; diff --git a/libs/construction/pom.xml b/libs/construction/pom.xml index 7e407562..70d329a1 100644 --- a/libs/construction/pom.xml +++ b/libs/construction/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} @@ -18,22 +18,4 @@ spring-boot-autoconfigure - - - - - maven-dependency-plugin - - - analyze - - - org.springframework.boot:spring-boot-autoconfigure - - - - - - - diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigMode.java b/libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigMode.java deleted file mode 100644 index 8a167f27..00000000 --- a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.smecalculus.bezmen.configuration.spec; - -public enum ConfigMode { - FILE_SYSTEM -} diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaConverter.java b/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaConverter.java deleted file mode 100644 index 71afae22..00000000 --- a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaConverter.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.smecalculus.bezmen.service.spec; - -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; - -public interface SepulkaConverter { - SepulkaRegRes toRegRes(Sepulka sepulka); -} diff --git a/libs/core/src/main/kotlin/org/smecalculus/bezmen/modeling/Sepulcarium.kt b/libs/core/src/main/kotlin/org/smecalculus/bezmen/modeling/Sepulcarium.kt deleted file mode 100644 index ab83920f..00000000 --- a/libs/core/src/main/kotlin/org/smecalculus/bezmen/modeling/Sepulcarium.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.smecalculus.bezmen.modeling - -class Sepulcarium diff --git a/libs/data/pom.xml b/libs/data/pom.xml index 1de5fcb8..583fa19b 100644 --- a/libs/data/pom.xml +++ b/libs/data/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} @@ -15,7 +15,7 @@ ${project.groupId} - core + essentials org.springframework @@ -57,24 +57,6 @@ maven-failsafe-plugin - - maven-dependency-plugin - - - analyze - - - com.h2database:h2 - org.postgresql:postgresql - org.smecalculus.bezmen:testing - - - org.springframework:spring-beans - - - - - diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorMode.java b/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorMode.java deleted file mode 100644 index 8a2839c3..00000000 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorMode.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.smecalculus.bezmen.configuration.spec; - -public enum VendorMode { - H2, - POSTGRES -} diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/impl/DataConfigImpl.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/impl/DataConfigImpl.java similarity index 58% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/impl/DataConfigImpl.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/impl/DataConfigImpl.java index bec7f787..e0c635ad 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/impl/DataConfigImpl.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/impl/DataConfigImpl.java @@ -1,14 +1,14 @@ -package org.smecalculus.bezmen.configuration.impl; +package smecalculus.bezmen.configuration.impl; import lombok.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.DataCfgMapper; -import org.smecalculus.bezmen.configuration.spec.DataConfig; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.DataPropsCfg; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.DataCfgMapper; +import smecalculus.bezmen.configuration.spec.DataConfig; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.DataPropsCfg; +import smecalculus.bezmen.validation.spec.BezmenValidator; public record DataConfigImpl( @NonNull ConfigKeeper configKeeper, @NonNull BezmenValidator validator, @NonNull DataCfgMapper mapper) diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataCfgMapper.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataCfgMapper.java similarity index 93% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataCfgMapper.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataCfgMapper.java index e61abea0..249e6c8c 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataCfgMapper.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataCfgMapper.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataConfig.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataConfig.java similarity index 55% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataConfig.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataConfig.java index 26497d7c..e4af401a 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataConfig.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataConfig.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; public interface DataConfig { DataProps getDataProps(); diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataProps.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataProps.java similarity index 74% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataProps.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataProps.java index 7856e355..b5f7c7be 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataProps.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; import lombok.NonNull; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataPropsCfg.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataPropsCfg.java similarity index 78% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataPropsCfg.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataPropsCfg.java index 8d7cbf59..d77140a2 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/DataPropsCfg.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/DataPropsCfg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2Props.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2Props.java similarity index 79% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2Props.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2Props.java index e38e713c..a4086a88 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2Props.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2Props.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; import lombok.NonNull; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2PropsCfg.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2PropsCfg.java similarity index 80% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2PropsCfg.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2PropsCfg.java index b8a55f23..2a6ec10c 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/H2PropsCfg.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/H2PropsCfg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmMode.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmMode.java similarity index 51% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmMode.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmMode.java index 358a13cc..82cf8354 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmMode.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmMode.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; public enum OrmMode { SPRING_DATA, diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmProps.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmProps.java similarity index 59% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmProps.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmProps.java index fdf1b87a..23abf5e0 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmProps.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java similarity index 51% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java index 8f76159d..0952e13b 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/OrmPropsCfg.java @@ -1,7 +1,7 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Data; -import org.smecalculus.bezmen.validation.spec.ValueOfEnum; +import smecalculus.bezmen.validation.spec.ValueOfEnum; @Data public class OrmPropsCfg { diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresProps.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresProps.java similarity index 80% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresProps.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresProps.java index 70b6c1c4..ba372e79 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresProps.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; import lombok.NonNull; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java similarity index 83% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java index 2a791b57..e02c3f34 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/PostgresPropsCfg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorMode.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorMode.java new file mode 100644 index 00000000..eaa2de28 --- /dev/null +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorMode.java @@ -0,0 +1,6 @@ +package smecalculus.bezmen.configuration.spec; + +public enum VendorMode { + H2, + POSTGRES +} diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorProps.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorProps.java similarity index 81% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorProps.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorProps.java index 0ab3d24d..5fd9ead4 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorProps.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import edu.umd.cs.findbugs.annotations.Nullable; import lombok.Builder; diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java similarity index 67% rename from libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java rename to libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java index ddbc5945..eb461b73 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java +++ b/libs/data/src/main/java/smecalculus/bezmen/configuration/spec/VendorPropsCfg.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import com.typesafe.config.Optional; import lombok.Data; -import org.smecalculus.bezmen.validation.spec.ValueOfEnum; +import smecalculus.bezmen.validation.spec.ValueOfEnum; @Data public class VendorPropsCfg { diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java similarity index 79% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java index 36758a8b..e7d41a17 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnOrmMode.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.smecalculus.bezmen.configuration.spec.OrmMode; import org.springframework.context.annotation.Conditional; +import smecalculus.bezmen.configuration.spec.OrmMode; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataBeans.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataBeans.java similarity index 82% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataBeans.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataBeans.java index 85e9c441..5b71668f 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataBeans.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataBeans.java @@ -1,14 +1,14 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import javax.sql.DataSource; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.H2Props; -import org.smecalculus.bezmen.configuration.spec.PostgresProps; -import org.smecalculus.bezmen.configuration.spec.VendorProps; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.jdbc.datasource.DriverManagerDataSource; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.H2Props; +import smecalculus.bezmen.configuration.spec.PostgresProps; +import smecalculus.bezmen.configuration.spec.VendorProps; @Configuration(proxyBeanMethods = false) @Import({DataConfigBeans.class, OrmMyBatisBeans.class, OrmSpringDataBeans.class}) diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataConfigBeans.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataConfigBeans.java similarity index 53% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataConfigBeans.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataConfigBeans.java index c0f388fb..9acb10f9 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/DataConfigBeans.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/DataConfigBeans.java @@ -1,14 +1,14 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import org.smecalculus.bezmen.configuration.impl.DataConfigImpl; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.DataCfgMapper; -import org.smecalculus.bezmen.configuration.spec.DataCfgMapperImpl; -import org.smecalculus.bezmen.configuration.spec.DataConfig; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import smecalculus.bezmen.configuration.impl.DataConfigImpl; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.DataCfgMapper; +import smecalculus.bezmen.configuration.spec.DataCfgMapperImpl; +import smecalculus.bezmen.configuration.spec.DataConfig; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.validation.spec.BezmenValidator; @Configuration(proxyBeanMethods = false) public class DataConfigBeans { diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmModeCondition.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmModeCondition.java similarity index 84% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmModeCondition.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmModeCondition.java index 074aa3eb..8969f668 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmModeCondition.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmModeCondition.java @@ -1,13 +1,13 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN; import java.util.Map; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.OrmMode; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConfigurationCondition; import org.springframework.core.type.AnnotatedTypeMetadata; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.OrmMode; class OrmModeCondition implements ConfigurationCondition { diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java similarity index 77% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java index 183160e8..9389961e 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmMyBatisBeans.java @@ -1,6 +1,6 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; +import static smecalculus.bezmen.configuration.spec.OrmMode.MY_BATIS; import javax.sql.DataSource; import org.apache.ibatis.session.SqlSessionFactory; @@ -11,7 +11,7 @@ @Configuration(proxyBeanMethods = false) @ConditionalOnOrmMode(MY_BATIS) -@MapperScan(basePackages = "org.smecalculus.bezmen.data.spec.mybatis") +@MapperScan(basePackages = "smecalculus.bezmen.data.spec.mybatis") public class OrmMyBatisBeans { @Bean diff --git a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java similarity index 82% rename from libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java rename to libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java index b649cdbd..1d9c5dd5 100644 --- a/libs/data/src/main/java/org/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java +++ b/libs/data/src/main/java/smecalculus/bezmen/construction/spec/OrmSpringDataBeans.java @@ -1,10 +1,8 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; +import static smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; import javax.sql.DataSource; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.VendorProps; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration; @@ -15,10 +13,12 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.VendorProps; @Configuration(proxyBeanMethods = false) @ConditionalOnOrmMode(SPRING_DATA) -@EnableJdbcRepositories("org.smecalculus.bezmen.data.spec.springdata") +@EnableJdbcRepositories("smecalculus.bezmen.data.spec.springdata") public class OrmSpringDataBeans extends AbstractJdbcConfiguration { @Bean diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/DataPropsFixture.java b/libs/data/src/test/java/org/smecalculus/bezmen/fixture/DataPropsFixture.java deleted file mode 100644 index dbfbdbbe..00000000 --- a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/DataPropsFixture.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.smecalculus.bezmen.fixture; - -import static org.smecalculus.bezmen.fixture.OrmPropsFixture.ormProps; -import static org.smecalculus.bezmen.fixture.OrmPropsFixture.ormPropsCfg; -import static org.smecalculus.bezmen.fixture.VendorPropsFixture.vendorProps; -import static org.smecalculus.bezmen.fixture.VendorPropsFixture.vendorPropsCfg; - -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.configuration.spec.DataPropsCfg; - -public class DataPropsFixture { - - public static DataProps.Builder dataProps() { - return DataProps.builder() - .vendorProps(vendorProps().build()) - .ormProps(ormProps().build()); - } - - public static DataPropsCfg dataPropsCfg() { - DataPropsCfg dataPropsCfg = new DataPropsCfg(); - dataPropsCfg.setVendor(vendorPropsCfg()); - dataPropsCfg.setOrm(ormPropsCfg()); - return dataPropsCfg; - } -} diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigIT.java b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigIT.java similarity index 66% rename from libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigIT.java rename to libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigIT.java index 24140b3e..8eb51944 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigIT.java +++ b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigIT.java @@ -1,18 +1,18 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; import static org.assertj.core.api.Assertions.assertThat; -import static org.smecalculus.bezmen.fixture.DataPropsFixture.dataProps; +import static smecalculus.bezmen.fixture.DataPropsFixture.dataProps; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.smecalculus.bezmen.configuration.spec.DataConfig; -import org.smecalculus.bezmen.configuration.spec.DataProps; -import org.smecalculus.bezmen.construction.spec.ConfigBeans; -import org.smecalculus.bezmen.construction.spec.DataConfigBeans; -import org.smecalculus.bezmen.construction.spec.ValidationBeans; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; +import smecalculus.bezmen.configuration.spec.DataConfig; +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.construction.spec.ConfigBeans; +import smecalculus.bezmen.construction.spec.DataConfigBeans; +import smecalculus.bezmen.construction.spec.ValidationBeans; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {ConfigBeans.class, ValidationBeans.class, DataConfigBeans.class}) diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplIT.java b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplIT.java similarity index 51% rename from libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplIT.java rename to libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplIT.java index 903a3930..0cbbc07c 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplIT.java +++ b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplIT.java @@ -1,3 +1,3 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; class DataConfigImplIT extends DataConfigIT {} diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplTest.java b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplTest.java similarity index 53% rename from libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplTest.java rename to libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplTest.java index 3a62c091..0cc4422d 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigImplTest.java +++ b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigImplTest.java @@ -1,3 +1,3 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; class DataConfigImplTest extends DataConfigTest {} diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigTest.java b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigTest.java similarity index 65% rename from libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigTest.java rename to libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigTest.java index 9238a666..19253e7a 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/configuration/DataConfigTest.java +++ b/libs/data/src/test/java/smecalculus/bezmen/configuration/DataConfigTest.java @@ -1,18 +1,18 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.smecalculus.bezmen.fixture.DataPropsFixture.dataPropsCfg; +import static smecalculus.bezmen.fixture.DataPropsFixture.dataPropsCfg; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.smecalculus.bezmen.configuration.impl.DataConfigImpl; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.DataCfgMapperImpl; -import org.smecalculus.bezmen.configuration.spec.DataConfig; -import org.smecalculus.bezmen.configuration.spec.DataPropsCfg; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; +import smecalculus.bezmen.configuration.impl.DataConfigImpl; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.DataCfgMapperImpl; +import smecalculus.bezmen.configuration.spec.DataConfig; +import smecalculus.bezmen.configuration.spec.DataPropsCfg; +import smecalculus.bezmen.validation.spec.BezmenValidator; abstract class DataConfigTest { diff --git a/libs/data/src/test/java/smecalculus/bezmen/fixture/DataPropsFixture.java b/libs/data/src/test/java/smecalculus/bezmen/fixture/DataPropsFixture.java new file mode 100644 index 00000000..5b3335c6 --- /dev/null +++ b/libs/data/src/test/java/smecalculus/bezmen/fixture/DataPropsFixture.java @@ -0,0 +1,25 @@ +package smecalculus.bezmen.fixture; + +import static smecalculus.bezmen.fixture.OrmPropsFixture.ormProps; +import static smecalculus.bezmen.fixture.OrmPropsFixture.ormPropsCfg; +import static smecalculus.bezmen.fixture.VendorPropsFixture.vendorProps; +import static smecalculus.bezmen.fixture.VendorPropsFixture.vendorPropsCfg; + +import smecalculus.bezmen.configuration.spec.DataProps; +import smecalculus.bezmen.configuration.spec.DataPropsCfg; + +public class DataPropsFixture { + + public static DataProps.Builder dataProps() { + return DataProps.builder() + .vendorProps(vendorProps().build()) + .ormProps(ormProps().build()); + } + + public static DataPropsCfg dataPropsCfg() { + DataPropsCfg dataPropsCfg = new DataPropsCfg(); + dataPropsCfg.setVendor(vendorPropsCfg()); + dataPropsCfg.setOrm(ormPropsCfg()); + return dataPropsCfg; + } +} diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/OrmPropsFixture.java b/libs/data/src/test/java/smecalculus/bezmen/fixture/OrmPropsFixture.java similarity index 57% rename from libs/data/src/test/java/org/smecalculus/bezmen/fixture/OrmPropsFixture.java rename to libs/data/src/test/java/smecalculus/bezmen/fixture/OrmPropsFixture.java index c876c820..c297de7a 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/OrmPropsFixture.java +++ b/libs/data/src/test/java/smecalculus/bezmen/fixture/OrmPropsFixture.java @@ -1,9 +1,9 @@ -package org.smecalculus.bezmen.fixture; +package smecalculus.bezmen.fixture; -import static org.smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; +import static smecalculus.bezmen.configuration.spec.OrmMode.SPRING_DATA; -import org.smecalculus.bezmen.configuration.spec.OrmProps; -import org.smecalculus.bezmen.configuration.spec.OrmPropsCfg; +import smecalculus.bezmen.configuration.spec.OrmProps; +import smecalculus.bezmen.configuration.spec.OrmPropsCfg; public class OrmPropsFixture { diff --git a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/VendorPropsFixture.java b/libs/data/src/test/java/smecalculus/bezmen/fixture/VendorPropsFixture.java similarity index 69% rename from libs/data/src/test/java/org/smecalculus/bezmen/fixture/VendorPropsFixture.java rename to libs/data/src/test/java/smecalculus/bezmen/fixture/VendorPropsFixture.java index 30a09456..d6af7869 100644 --- a/libs/data/src/test/java/org/smecalculus/bezmen/fixture/VendorPropsFixture.java +++ b/libs/data/src/test/java/smecalculus/bezmen/fixture/VendorPropsFixture.java @@ -1,9 +1,9 @@ -package org.smecalculus.bezmen.fixture; +package smecalculus.bezmen.fixture; -import org.smecalculus.bezmen.configuration.spec.H2Props; -import org.smecalculus.bezmen.configuration.spec.VendorMode; -import org.smecalculus.bezmen.configuration.spec.VendorProps; -import org.smecalculus.bezmen.configuration.spec.VendorPropsCfg; +import smecalculus.bezmen.configuration.spec.H2Props; +import smecalculus.bezmen.configuration.spec.VendorMode; +import smecalculus.bezmen.configuration.spec.VendorProps; +import smecalculus.bezmen.configuration.spec.VendorPropsCfg; public class VendorPropsFixture { public static VendorProps.Builder vendorProps() { diff --git a/libs/core/README.adoc b/libs/essentials/README.adoc similarity index 100% rename from libs/core/README.adoc rename to libs/essentials/README.adoc diff --git a/libs/core/pom.xml b/libs/essentials/pom.xml similarity index 66% rename from libs/core/pom.xml rename to libs/essentials/pom.xml index 92a0e65d..0e925e16 100644 --- a/libs/core/pom.xml +++ b/libs/essentials/pom.xml @@ -5,12 +5,12 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} - core + essentials @@ -73,29 +73,4 @@ kotlin-reflect - - - - - maven-dependency-plugin - - - analyze - - - org.mapstruct:mapstruct - com.github.spotbugs:spotbugs-annotations - org.hibernate.validator:hibernate-validator - org.glassfish.expressly:expressly - org.slf4j:slf4j-api - ch.qos.logback:logback-classic - org.jetbrains.kotlin:kotlin-stdlib - org.jetbrains.kotlin:kotlin-reflect - - - - - - - diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java similarity index 73% rename from libs/core/src/main/java/org/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java rename to libs/essentials/src/main/java/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java index 47f5519a..74fe2e2a 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/impl/ConfigKeeperLightbendConfig.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.configuration.impl; +package smecalculus.bezmen.configuration.impl; import com.typesafe.config.Config; import com.typesafe.config.ConfigBeanFactory; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; public record ConfigKeeperLightbendConfig(Config config) implements ConfigKeeper { diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigKeeper.java b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigKeeper.java similarity index 60% rename from libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigKeeper.java rename to libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigKeeper.java index 92350525..6a8c4b07 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/configuration/spec/ConfigKeeper.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigKeeper.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; public interface ConfigKeeper { T read(String key, Class type); diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigMode.java b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigMode.java new file mode 100644 index 00000000..a2f4513e --- /dev/null +++ b/libs/essentials/src/main/java/smecalculus/bezmen/configuration/spec/ConfigMode.java @@ -0,0 +1,5 @@ +package smecalculus.bezmen.configuration.spec; + +public enum ConfigMode { + FILE_SYSTEM +} diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ConfigBeans.java b/libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ConfigBeans.java similarity index 68% rename from libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ConfigBeans.java rename to libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ConfigBeans.java index 0f11dc80..c338a12d 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ConfigBeans.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ConfigBeans.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import com.typesafe.config.ConfigFactory; -import org.smecalculus.bezmen.configuration.impl.ConfigKeeperLightbendConfig; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.ConfigMode; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import smecalculus.bezmen.configuration.impl.ConfigKeeperLightbendConfig; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.ConfigMode; @Configuration(proxyBeanMethods = false) public class ConfigBeans { diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ValidationBeans.java b/libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ValidationBeans.java similarity index 71% rename from libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ValidationBeans.java rename to libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ValidationBeans.java index ad9f5c2f..27b65444 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/construction/spec/ValidationBeans.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/construction/spec/ValidationBeans.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import jakarta.validation.Validation; import jakarta.validation.ValidatorFactory; -import org.smecalculus.bezmen.validation.impl.BezmenValidatorHibernateValidator; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import smecalculus.bezmen.validation.impl.BezmenValidatorHibernateValidator; +import smecalculus.bezmen.validation.spec.BezmenValidator; @Configuration(proxyBeanMethods = false) public class ValidationBeans { diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/Sepulka.java b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/Sepulka.java similarity index 76% rename from libs/core/src/main/java/org/smecalculus/bezmen/service/spec/Sepulka.java rename to libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/Sepulka.java index 644a8666..72e246b8 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/Sepulka.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/Sepulka.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.service.spec; +package smecalculus.bezmen.domain.spec; import java.util.UUID; import lombok.Builder; diff --git a/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaConverter.java b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaConverter.java new file mode 100644 index 00000000..87cd4008 --- /dev/null +++ b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaConverter.java @@ -0,0 +1,7 @@ +package smecalculus.bezmen.domain.spec; + +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; + +public interface SepulkaConverter { + SepulkaRegRes toRegRes(Sepulka sepulka); +} diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaService.java b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaService.java similarity index 58% rename from libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaService.java rename to libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaService.java index f5e66ba7..0e7462f5 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/service/spec/SepulkaService.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/domain/spec/SepulkaService.java @@ -1,7 +1,7 @@ -package org.smecalculus.bezmen.service.spec; +package smecalculus.bezmen.domain.spec; import java.util.List; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; public interface SepulkaService { Sepulka register(SepulkaRegReq sepulkaRegReq); diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java b/libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java similarity index 83% rename from libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java rename to libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java index c7b5adf4..deb6cc3a 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/BezmenValidatorHibernateValidator.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.validation.impl; +package smecalculus.bezmen.validation.impl; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validator; import java.util.Set; import lombok.NonNull; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; +import smecalculus.bezmen.validation.spec.BezmenValidator; public record BezmenValidatorHibernateValidator(@NonNull Validator validator) implements BezmenValidator { diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java b/libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java similarity index 90% rename from libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java rename to libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java index 0200508e..d7d60f18 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/validation/impl/ValueOfEnumValidator.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.validation.impl; +package smecalculus.bezmen.validation.impl; import static java.lang.String.format; import static java.util.stream.Collectors.toSet; @@ -7,7 +7,7 @@ import jakarta.validation.ConstraintValidatorContext; import java.util.Set; import java.util.stream.Stream; -import org.smecalculus.bezmen.validation.spec.ValueOfEnum; +import smecalculus.bezmen.validation.spec.ValueOfEnum; public class ValueOfEnumValidator implements ConstraintValidator { private Set allowedValues; diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/BezmenValidator.java b/libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/BezmenValidator.java similarity index 65% rename from libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/BezmenValidator.java rename to libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/BezmenValidator.java index 00cbfadb..550ca09b 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/BezmenValidator.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/BezmenValidator.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.validation.spec; +package smecalculus.bezmen.validation.spec; public interface BezmenValidator { void validate(T object, Class... groups); diff --git a/libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/ValueOfEnum.java b/libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/ValueOfEnum.java similarity index 85% rename from libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/ValueOfEnum.java rename to libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/ValueOfEnum.java index a9c781aa..2e95e7d1 100644 --- a/libs/core/src/main/java/org/smecalculus/bezmen/validation/spec/ValueOfEnum.java +++ b/libs/essentials/src/main/java/smecalculus/bezmen/validation/spec/ValueOfEnum.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.validation.spec; +package smecalculus.bezmen.validation.spec; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.TYPE_USE; @@ -8,7 +8,7 @@ import jakarta.validation.Payload; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import org.smecalculus.bezmen.validation.impl.ValueOfEnumValidator; +import smecalculus.bezmen.validation.impl.ValueOfEnumValidator; @Target({FIELD, TYPE_USE}) @Retention(RUNTIME) diff --git a/libs/essentials/src/main/kotlin/smecalculus/bezmen/modeling/Sepulcarium.kt b/libs/essentials/src/main/kotlin/smecalculus/bezmen/modeling/Sepulcarium.kt new file mode 100644 index 00000000..62f2aaa0 --- /dev/null +++ b/libs/essentials/src/main/kotlin/smecalculus/bezmen/modeling/Sepulcarium.kt @@ -0,0 +1,3 @@ +package smecalculus.bezmen.modeling + +class Sepulcarium diff --git a/libs/messaging/pom.xml b/libs/messaging/pom.xml index 3f3fccce..f4756516 100644 --- a/libs/messaging/pom.xml +++ b/libs/messaging/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} @@ -15,7 +15,7 @@ ${project.groupId} - core + essentials @@ -51,29 +51,4 @@ test - - - - - maven-dependency-plugin - - - analyze - - - org.eclipse.jetty:jetty-servlets - org.eclipse.jetty:jetty-webapp - org.springframework.boot:spring-boot-actuator - org.springframework.boot:spring-boot-actuator-autoconfigure - org.smecalculus.bezmen:testing - - - org.springframework:spring-beans - - - - - - - diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProtocol.java b/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProtocol.java deleted file mode 100644 index fda2a612..00000000 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProtocol.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.smecalculus.bezmen.configuration.spec; - -public enum MessagingProtocol { - HTTP -} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebMode.java b/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebMode.java deleted file mode 100644 index 8d829dea..00000000 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.smecalculus.bezmen.configuration.spec; - -public enum WebMode { - SPRING_MVC -} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebPropsCfg.java b/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebPropsCfg.java deleted file mode 100644 index 37f80ebe..00000000 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebPropsCfg.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.smecalculus.bezmen.configuration.spec; - -import lombok.Data; -import org.smecalculus.bezmen.validation.spec.ValueOfEnum; - -@Data -public class WebPropsCfg { - - @ValueOfEnum(WebMode.class) - String mode; -} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java similarity index 59% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java index bd070a34..5013641f 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/impl/MessagingConfigImpl.java @@ -1,14 +1,14 @@ -package org.smecalculus.bezmen.configuration.impl; +package smecalculus.bezmen.configuration.impl; import lombok.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.MessagingCfgMapper; -import org.smecalculus.bezmen.configuration.spec.MessagingConfig; -import org.smecalculus.bezmen.configuration.spec.MessagingProps; -import org.smecalculus.bezmen.configuration.spec.MessagingPropsCfg; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.MessagingCfgMapper; +import smecalculus.bezmen.configuration.spec.MessagingConfig; +import smecalculus.bezmen.configuration.spec.MessagingProps; +import smecalculus.bezmen.configuration.spec.MessagingPropsCfg; +import smecalculus.bezmen.validation.spec.BezmenValidator; public record MessagingConfigImpl( @NonNull ConfigKeeper keeper, @NonNull BezmenValidator validator, @NonNull MessagingCfgMapper mapper) diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpProps.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpProps.java similarity index 68% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpProps.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpProps.java index d88152cd..ae4a09c7 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpProps.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; import lombok.NonNull; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java similarity index 73% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java index cc5505ed..a7394218 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/HttpPropsCfg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java similarity index 93% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java index 241c9ba3..80fd324f 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingCfgMapper.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingConfig.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingConfig.java similarity index 60% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingConfig.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingConfig.java index f50bdd88..7680cdb3 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingConfig.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingConfig.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; public interface MessagingConfig { MessagingProps getMessagingProps(); diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProps.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProps.java similarity index 71% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProps.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProps.java index 0fb8b686..56cadd1d 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingProps.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; import lombok.NonNull; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java similarity index 75% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java index a222ccbf..e2e3ba0e 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingPropsCfg.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProtocol.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProtocol.java new file mode 100644 index 00000000..4545819a --- /dev/null +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/MessagingProtocol.java @@ -0,0 +1,5 @@ +package smecalculus.bezmen.configuration.spec; + +public enum MessagingProtocol { + HTTP +} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolProps.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolProps.java similarity index 81% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolProps.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolProps.java index c0f37ef8..a75f0c77 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolProps.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Set; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java similarity index 75% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java index b00585a1..c1c81222 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/ProtocolPropsCfg.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import com.typesafe.config.Optional; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.util.Set; import lombok.Data; -import org.smecalculus.bezmen.validation.spec.ValueOfEnum; +import smecalculus.bezmen.validation.spec.ValueOfEnum; @Data public class ProtocolPropsCfg { diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebMode.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebMode.java new file mode 100644 index 00000000..7f885417 --- /dev/null +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebMode.java @@ -0,0 +1,5 @@ +package smecalculus.bezmen.configuration.spec; + +public enum WebMode { + SPRING_MVC +} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebProps.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebProps.java similarity index 60% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebProps.java rename to libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebProps.java index 58f3aa92..aa4f2d55 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/configuration/spec/WebProps.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebProps.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.configuration.spec; +package smecalculus.bezmen.configuration.spec; import lombok.Builder; diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebPropsCfg.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebPropsCfg.java new file mode 100644 index 00000000..79338587 --- /dev/null +++ b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/spec/WebPropsCfg.java @@ -0,0 +1,11 @@ +package smecalculus.bezmen.configuration.spec; + +import lombok.Data; +import smecalculus.bezmen.validation.spec.ValueOfEnum; + +@Data +public class WebPropsCfg { + + @ValueOfEnum(WebMode.class) + String mode; +} diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java similarity index 79% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java rename to libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java index 2fc68603..64953740 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/ConditionalOnWebMode.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.smecalculus.bezmen.configuration.spec.WebMode; import org.springframework.context.annotation.Conditional; +import smecalculus.bezmen.configuration.spec.WebMode; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingBeans.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingBeans.java similarity index 83% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingBeans.java rename to libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingBeans.java index be82db07..1b74cc86 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingBeans.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingBeans.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java similarity index 54% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java rename to libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java index 150f1aea..ab754e24 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/MessagingConfigBeans.java @@ -1,14 +1,14 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import org.smecalculus.bezmen.configuration.impl.MessagingConfigImpl; -import org.smecalculus.bezmen.configuration.spec.ConfigKeeper; -import org.smecalculus.bezmen.configuration.spec.MessagingCfgMapper; -import org.smecalculus.bezmen.configuration.spec.MessagingCfgMapperImpl; -import org.smecalculus.bezmen.configuration.spec.MessagingConfig; -import org.smecalculus.bezmen.configuration.spec.MessagingProps; -import org.smecalculus.bezmen.validation.spec.BezmenValidator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import smecalculus.bezmen.configuration.impl.MessagingConfigImpl; +import smecalculus.bezmen.configuration.spec.ConfigKeeper; +import smecalculus.bezmen.configuration.spec.MessagingCfgMapper; +import smecalculus.bezmen.configuration.spec.MessagingCfgMapperImpl; +import smecalculus.bezmen.configuration.spec.MessagingConfig; +import smecalculus.bezmen.configuration.spec.MessagingProps; +import smecalculus.bezmen.validation.spec.BezmenValidator; @Configuration(proxyBeanMethods = false) public class MessagingConfigBeans { diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebModeCondition.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebModeCondition.java similarity index 78% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebModeCondition.java rename to libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebModeCondition.java index dfa71a4e..93c95e3f 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebModeCondition.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebModeCondition.java @@ -1,16 +1,16 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; import static java.util.Objects.nonNull; -import static org.smecalculus.bezmen.configuration.spec.MessagingProtocol.HTTP; import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN; +import static smecalculus.bezmen.configuration.spec.MessagingProtocol.HTTP; import java.util.Map; -import org.smecalculus.bezmen.configuration.spec.HttpProps; -import org.smecalculus.bezmen.configuration.spec.MessagingProps; -import org.smecalculus.bezmen.configuration.spec.WebMode; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.ConfigurationCondition; import org.springframework.core.type.AnnotatedTypeMetadata; +import smecalculus.bezmen.configuration.spec.HttpProps; +import smecalculus.bezmen.configuration.spec.MessagingProps; +import smecalculus.bezmen.configuration.spec.WebMode; class WebModeCondition implements ConfigurationCondition { diff --git a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java similarity index 67% rename from libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java rename to libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java index 04604ddf..56c104b5 100644 --- a/libs/messaging/src/main/java/org/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java +++ b/libs/messaging/src/main/java/smecalculus/bezmen/construction/spec/WebSpringMvcBeans.java @@ -1,6 +1,6 @@ -package org.smecalculus.bezmen.construction.spec; +package smecalculus.bezmen.construction.spec; -import static org.smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; +import static smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.EnableWebMvc; diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/HttpPropsFixture.java b/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/HttpPropsFixture.java deleted file mode 100644 index a767e5ec..00000000 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/HttpPropsFixture.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.smecalculus.bezmen.fixture; - -import static org.smecalculus.bezmen.fixture.MvcPropsFixture.mvcProps; - -import org.smecalculus.bezmen.configuration.spec.HttpProps; - -public class HttpPropsFixture { - public static HttpProps.Builder httpProps() { - return HttpProps.builder().webProps(mvcProps().build()); - } -} diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MvcPropsFixture.java b/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MvcPropsFixture.java deleted file mode 100644 index 58dc2c8b..00000000 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MvcPropsFixture.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.smecalculus.bezmen.fixture; - -import static org.smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; - -import org.smecalculus.bezmen.configuration.spec.WebProps; - -public class MvcPropsFixture { - public static WebProps.Builder mvcProps() { - return WebProps.builder().webMode(SPRING_MVC); - } -} diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/ProtocolPropsFixture.java b/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/ProtocolPropsFixture.java deleted file mode 100644 index aada4f90..00000000 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/ProtocolPropsFixture.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.smecalculus.bezmen.fixture; - -import static org.smecalculus.bezmen.configuration.spec.MessagingProtocol.HTTP; -import static org.smecalculus.bezmen.fixture.HttpPropsFixture.httpProps; - -import java.util.Set; -import org.smecalculus.bezmen.configuration.spec.ProtocolProps; - -public class ProtocolPropsFixture { - public static ProtocolProps.Builder protocolProps() { - return ProtocolProps.builder().types(Set.of(HTTP)).httpProps(httpProps().build()); - } -} diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigIT.java b/libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigIT.java similarity index 67% rename from libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigIT.java rename to libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigIT.java index 4e4a860f..8bee8678 100644 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigIT.java +++ b/libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigIT.java @@ -1,18 +1,18 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; import static org.assertj.core.api.Assertions.assertThat; -import static org.smecalculus.bezmen.fixture.MessagingPropsFixture.messagingProps; +import static smecalculus.bezmen.fixture.MessagingPropsFixture.messagingProps; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.smecalculus.bezmen.configuration.spec.MessagingConfig; -import org.smecalculus.bezmen.configuration.spec.MessagingProps; -import org.smecalculus.bezmen.construction.spec.ConfigBeans; -import org.smecalculus.bezmen.construction.spec.MessagingConfigBeans; -import org.smecalculus.bezmen.construction.spec.ValidationBeans; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; +import smecalculus.bezmen.configuration.spec.MessagingConfig; +import smecalculus.bezmen.configuration.spec.MessagingProps; +import smecalculus.bezmen.construction.spec.ConfigBeans; +import smecalculus.bezmen.construction.spec.MessagingConfigBeans; +import smecalculus.bezmen.construction.spec.ValidationBeans; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {ConfigBeans.class, ValidationBeans.class, MessagingConfigBeans.class}) diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigImplIT.java b/libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigImplIT.java similarity index 55% rename from libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigImplIT.java rename to libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigImplIT.java index 36bc335d..159e3c5f 100644 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/configuration/MessagingConfigImplIT.java +++ b/libs/messaging/src/test/java/smecalculus/bezmen/configuration/MessagingConfigImplIT.java @@ -1,3 +1,3 @@ -package org.smecalculus.bezmen.configuration; +package smecalculus.bezmen.configuration; class MessagingConfigImplIT extends MessagingConfigIT {} diff --git a/libs/messaging/src/test/java/smecalculus/bezmen/fixture/HttpPropsFixture.java b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/HttpPropsFixture.java new file mode 100644 index 00000000..53611f32 --- /dev/null +++ b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/HttpPropsFixture.java @@ -0,0 +1,11 @@ +package smecalculus.bezmen.fixture; + +import static smecalculus.bezmen.fixture.MvcPropsFixture.mvcProps; + +import smecalculus.bezmen.configuration.spec.HttpProps; + +public class HttpPropsFixture { + public static HttpProps.Builder httpProps() { + return HttpProps.builder().webProps(mvcProps().build()); + } +} diff --git a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MessagingPropsFixture.java b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/MessagingPropsFixture.java similarity index 50% rename from libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MessagingPropsFixture.java rename to libs/messaging/src/test/java/smecalculus/bezmen/fixture/MessagingPropsFixture.java index c9a078b0..1744b5f6 100644 --- a/libs/messaging/src/test/java/org/smecalculus/bezmen/fixture/MessagingPropsFixture.java +++ b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/MessagingPropsFixture.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen.fixture; +package smecalculus.bezmen.fixture; -import static org.smecalculus.bezmen.fixture.ProtocolPropsFixture.protocolProps; +import static smecalculus.bezmen.fixture.ProtocolPropsFixture.protocolProps; -import org.smecalculus.bezmen.configuration.spec.MessagingProps; +import smecalculus.bezmen.configuration.spec.MessagingProps; public class MessagingPropsFixture { public static MessagingProps.Builder messagingProps() { diff --git a/libs/messaging/src/test/java/smecalculus/bezmen/fixture/MvcPropsFixture.java b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/MvcPropsFixture.java new file mode 100644 index 00000000..70f18c6f --- /dev/null +++ b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/MvcPropsFixture.java @@ -0,0 +1,11 @@ +package smecalculus.bezmen.fixture; + +import static smecalculus.bezmen.configuration.spec.WebMode.SPRING_MVC; + +import smecalculus.bezmen.configuration.spec.WebProps; + +public class MvcPropsFixture { + public static WebProps.Builder mvcProps() { + return WebProps.builder().webMode(SPRING_MVC); + } +} diff --git a/libs/messaging/src/test/java/smecalculus/bezmen/fixture/ProtocolPropsFixture.java b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/ProtocolPropsFixture.java new file mode 100644 index 00000000..f2334bde --- /dev/null +++ b/libs/messaging/src/test/java/smecalculus/bezmen/fixture/ProtocolPropsFixture.java @@ -0,0 +1,13 @@ +package smecalculus.bezmen.fixture; + +import static smecalculus.bezmen.configuration.spec.MessagingProtocol.HTTP; +import static smecalculus.bezmen.fixture.HttpPropsFixture.httpProps; + +import java.util.Set; +import smecalculus.bezmen.configuration.spec.ProtocolProps; + +public class ProtocolPropsFixture { + public static ProtocolProps.Builder protocolProps() { + return ProtocolProps.builder().types(Set.of(HTTP)).httpProps(httpProps().build()); + } +} diff --git a/libs/pom.xml b/libs/pom.xml index 9e600f0e..8d32de4e 100644 --- a/libs/pom.xml +++ b/libs/pom.xml @@ -6,16 +6,16 @@ pom - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} + essentials construction messaging client data - core testing @@ -59,7 +59,7 @@ ${project.groupId} - core + essentials ${project.version} @@ -430,25 +430,6 @@ maven-dependency-plugin 3.6.0 - - analyze - - analyze-only - - - true - true - true - - *:* - - - org.projectlombok:lombok - org.junit.jupiter:junit-jupiter-engine - - - - reset clean @@ -506,14 +487,13 @@ - - org.smecalculus.bezmen + smecalculus.bezmen @@ -538,7 +518,6 @@ default-report - test report diff --git a/libs/testing/pom.xml b/libs/testing/pom.xml index c547ceac..a4a4196c 100644 --- a/libs/testing/pom.xml +++ b/libs/testing/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen libs ${revision} @@ -15,7 +15,7 @@ ${project.groupId} - core + essentials ${project.groupId} @@ -84,27 +84,6 @@ maven-resources-plugin - - maven-dependency-plugin - - - analyze - - - org.liquibase:liquibase-core - org.assertj:assertj-core - org.springframework:spring-test - org.mockito:mockito-core - org.awaitility:awaitility - org.springframework:spring-webflux - io.projectreactor:reactor-core - org.reactivestreams:reactive-streams - org.junit.platform:junit-platform-suite - - - - - diff --git a/libs/testing/src/main/java/org/smecalculus/bezmen/construction/TestingBeans.java b/libs/testing/src/main/java/smecalculus/bezmen/construction/spec/TestingBeans.java similarity index 94% rename from libs/testing/src/main/java/org/smecalculus/bezmen/construction/TestingBeans.java rename to libs/testing/src/main/java/smecalculus/bezmen/construction/spec/TestingBeans.java index 847a30c7..59fdb287 100644 --- a/libs/testing/src/main/java/org/smecalculus/bezmen/construction/TestingBeans.java +++ b/libs/testing/src/main/java/smecalculus/bezmen/construction/spec/TestingBeans.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.construction; +package smecalculus.bezmen.construction.spec; import static org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType.H2; diff --git a/libs/testing/src/main/java/org/smecalculus/bezmen/fixture/SepulkaFixtures.java b/libs/testing/src/main/java/smecalculus/bezmen/fixture/SepulkaFixtures.java similarity index 80% rename from libs/testing/src/main/java/org/smecalculus/bezmen/fixture/SepulkaFixtures.java rename to libs/testing/src/main/java/smecalculus/bezmen/fixture/SepulkaFixtures.java index 022bc575..6b3e5254 100644 --- a/libs/testing/src/main/java/org/smecalculus/bezmen/fixture/SepulkaFixtures.java +++ b/libs/testing/src/main/java/smecalculus/bezmen/fixture/SepulkaFixtures.java @@ -1,9 +1,9 @@ -package org.smecalculus.bezmen.fixture; +package smecalculus.bezmen.fixture; import java.util.UUID; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; -import org.smecalculus.bezmen.service.spec.Sepulka; +import smecalculus.bezmen.domain.spec.Sepulka; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; public class SepulkaFixtures { public static final String NAME = "foo"; diff --git a/libs/testing/src/main/java/org/smecalculus/bezmen/testing/ShardingExtension.java b/libs/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java similarity index 96% rename from libs/testing/src/main/java/org/smecalculus/bezmen/testing/ShardingExtension.java rename to libs/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java index 255739d8..8742333b 100644 --- a/libs/testing/src/main/java/org/smecalculus/bezmen/testing/ShardingExtension.java +++ b/libs/testing/src/main/java/smecalculus/bezmen/testing/ShardingExtension.java @@ -1,4 +1,4 @@ -package org.smecalculus.bezmen.testing; +package smecalculus.bezmen.testing; import static org.junit.jupiter.api.extension.ConditionEvaluationResult.disabled; import static org.junit.jupiter.api.extension.ConditionEvaluationResult.enabled; diff --git a/libs/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/libs/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension index c7844d25..747167d4 100644 --- a/libs/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ b/libs/testing/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension @@ -1 +1 @@ -org.smecalculus.bezmen.testing.ShardingExtension +smecalculus.bezmen.testing.ShardingExtension diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..b43c0af9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + pom + + smecalculus.bezmen + root + latest + + + libs + apps + tools + tests + + + + + + + maven-enforcer-plugin + 3.4.1 + + true + + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + true + + + + maven-install-plugin + 3.1.1 + + true + + + + maven-deploy-plugin + 3.1.1 + + true + + + + + + diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index 5601c5da..eb2e6ad4 100644 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen tests latest @@ -47,7 +47,7 @@ maven-surefire-plugin - org.smecalculus.bezmen.${suite.name} + smecalculus.bezmen.${suite.name} diff --git a/tests/e2e/src/main/java/org/smecalculus/bezmen/StandBeans.java b/tests/e2e/src/main/java/smecalculus/bezmen/StandBeans.java similarity index 75% rename from tests/e2e/src/main/java/org/smecalculus/bezmen/StandBeans.java rename to tests/e2e/src/main/java/smecalculus/bezmen/StandBeans.java index 359cea21..36822db5 100644 --- a/tests/e2e/src/main/java/org/smecalculus/bezmen/StandBeans.java +++ b/tests/e2e/src/main/java/smecalculus/bezmen/StandBeans.java @@ -1,11 +1,11 @@ -package org.smecalculus.bezmen; +package smecalculus.bezmen; import com.fasterxml.jackson.databind.ObjectMapper; import java.net.http.HttpClient; -import org.smecalculus.bezmen.messaging.impl.BezmenClientJavaHttp; -import org.smecalculus.bezmen.messaging.spec.BezmenClient; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import smecalculus.bezmen.messaging.impl.BezmenClientJavaHttp; +import smecalculus.bezmen.messaging.spec.BezmenClient; @Configuration(proxyBeanMethods = false) public class StandBeans { diff --git a/tests/e2e/src/test/java/org/smecalculus/bezmen/FuncSuite.java b/tests/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java similarity index 59% rename from tests/e2e/src/test/java/org/smecalculus/bezmen/FuncSuite.java rename to tests/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java index 861246c9..ba266a8a 100644 --- a/tests/e2e/src/test/java/org/smecalculus/bezmen/FuncSuite.java +++ b/tests/e2e/src/test/java/smecalculus/bezmen/FuncSuite.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen; +package smecalculus.bezmen; import org.junit.platform.suite.api.SelectPackages; import org.junit.platform.suite.api.Suite; @Suite -@SelectPackages("org.smecalculus.bezmen.registration") +@SelectPackages("smecalculus.bezmen.registration") public class FuncSuite {} diff --git a/tests/e2e/src/test/java/org/smecalculus/bezmen/ToySuite.java b/tests/e2e/src/test/java/smecalculus/bezmen/ToySuite.java similarity index 59% rename from tests/e2e/src/test/java/org/smecalculus/bezmen/ToySuite.java rename to tests/e2e/src/test/java/smecalculus/bezmen/ToySuite.java index 430e3a45..7c061d0f 100644 --- a/tests/e2e/src/test/java/org/smecalculus/bezmen/ToySuite.java +++ b/tests/e2e/src/test/java/smecalculus/bezmen/ToySuite.java @@ -1,8 +1,8 @@ -package org.smecalculus.bezmen; +package smecalculus.bezmen; import org.junit.platform.suite.api.SelectPackages; import org.junit.platform.suite.api.Suite; @Suite -@SelectPackages("org.smecalculus.bezmen.registration") +@SelectPackages("smecalculus.bezmen.registration") public class ToySuite {} diff --git a/tests/e2e/src/test/java/org/smecalculus/bezmen/registration/SepulkaTest.java b/tests/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java similarity index 79% rename from tests/e2e/src/test/java/org/smecalculus/bezmen/registration/SepulkaTest.java rename to tests/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java index 84d8e7da..c5d03891 100644 --- a/tests/e2e/src/test/java/org/smecalculus/bezmen/registration/SepulkaTest.java +++ b/tests/e2e/src/test/java/smecalculus/bezmen/registration/SepulkaTest.java @@ -1,23 +1,23 @@ -package org.smecalculus.bezmen.registration; +package smecalculus.bezmen.registration; import static java.time.Duration.ofSeconds; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegReqPojo; -import static org.smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegResPojo; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegReqPojo; +import static smecalculus.bezmen.fixture.SepulkaFixtures.sepulkaRegResPojo; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import org.junit.jupiter.api.extension.ExtendWith; -import org.smecalculus.bezmen.StandBeans; -import org.smecalculus.bezmen.messaging.spec.BezmenClient; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegReq; -import org.smecalculus.bezmen.messaging.spec.SepulkaRegRes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; +import smecalculus.bezmen.StandBeans; +import smecalculus.bezmen.messaging.spec.BezmenClient; +import smecalculus.bezmen.messaging.spec.SepulkaRegReq; +import smecalculus.bezmen.messaging.spec.SepulkaRegRes; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = StandBeans.class) diff --git a/tests/pom.xml b/tests/pom.xml index 9f408517..068b8914 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ pom - org.smecalculus.bezmen + smecalculus.bezmen tests latest @@ -16,7 +16,6 @@ turing - LATEST 1.18.28 UTF-8 @@ -28,20 +27,12 @@ - - - org.projectlombok - lombok - provided - - - ${project.groupId} libs - ${lib.version} + 0.1.0-SNAPSHOT pom import @@ -65,25 +56,12 @@ - maven-compiler-plugin - 3.11.0 + maven-enforcer-plugin + 3.4.1 - 17 - 17 - UTF-8 - - - org.projectlombok - lombok - ${lombok.version} - - + true - - maven-surefire-plugin - 3.1.2 - com.diffplug.spotless spotless-maven-plugin @@ -119,6 +97,26 @@ + + maven-compiler-plugin + 3.11.0 + + 17 + 17 + UTF-8 + + + org.projectlombok + lombok + ${lombok.version} + + + + + + maven-surefire-plugin + 3.1.2 + diff --git a/.tools/README.adoc b/tools/README.adoc similarity index 100% rename from .tools/README.adoc rename to tools/README.adoc diff --git a/.tools/pom.xml b/tools/pom.xml similarity index 86% rename from .tools/pom.xml rename to tools/pom.xml index 2118ca21..a35a517c 100644 --- a/.tools/pom.xml +++ b/tools/pom.xml @@ -4,13 +4,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.smecalculus.bezmen + smecalculus.bezmen tools latest + + maven-enforcer-plugin + 3.4.1 + + true + + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + true + + maven-antrun-plugin 3.1.0