Refine module and package structure

.dx/binaries.yml

@@ -15,7 +15,7 @@
           {% endif %}
           dependency:get
           --define transitive=false
-          --define artifact=org.smecalculus.bezmen:libs:{{ lib_version }}:pom
+          --define artifact=smecalculus.bezmen:libs:{{ lib_version }}:pom
         chdir: "{{ playbook_dir }}/../libs"
       register: binary_status
       changed_when: binary_status.rc != 0

.github/dependabot.yml

@@ -15,13 +15,13 @@ 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"
     schedule:

.github/workflows/solution-sanity.yml

@@ -22,12 +22,32 @@ jobs:
       - uses: ./.github/actions/prepare
         with:
           tools: python java
-      - run: ansible-playbook sources.yml -l lib:app
+      - id: codebase
+#        run: ansible-playbook sources.yml -l lib:app
+        run: echo foo
         working-directory: .dx
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: >
+      - uses: actions/[email protected]
+        with:
+          script: |
+            // Docs: https://docs.github.com/en/rest/checks/runs#create-a-check-run
+            // Rest: https://octokit.github.io/rest.js/v20#checks-create
+            await github.rest.checks.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: "codebase-checks",
+              status: "completed",
+              conclusion: "${{ steps.codebase.outcome }}",
+              output: {
+                title: "Codebase checks",
+                summary: "${{ steps.codebase.outcome }}",
+                text: "${{ steps.codebase.outcome }}",
+              },
+            });
+      - id: binaries
+        run: >
           ansible-playbook binaries.yml
           -e binary_repo=maven.pkg.github.com
           -e focus=solution
@@ -48,3 +68,20 @@ jobs:
           files: |
             libs/*/target/surefire-reports/TEST-*.xml
             apps/*/target/surefire-reports/TEST-*.xml
+      - uses: actions/[email protected]
+        with:
+          script: |
+            // Docs: https://docs.github.com/en/rest/checks/runs#create-a-check-run
+            // Rest: https://octokit.github.io/rest.js/v20#checks-create
+            await github.rest.checks.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: "unit-tests",
+              status: "completed",
+              conclusion: "${{ steps.binaries.outcome }}",
+              output: {
+                title: "Unit tests",
+                summary: "${{ steps.binaries.outcome }}",
+                text: "${{ steps.binaries.outcome }}",
+              },
+            });

.tools/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.smecalculus.bezmen</groupId>
+  <groupId>smecalculus.bezmen</groupId>
   <artifactId>tools</artifactId>
   <version>latest</version>
 

README.adoc

@@ -79,7 +79,6 @@
 . Параллелизация модульных тестов
 . Построение дерева хешей (взглянуть критически)
 . Версионирование библиотек и приложений (взглянуть критически)
-. Агрегация отчетов покрытия (взглянуть критически)
 . Локальные проверки в удаленном репозитории
-. Чистка пакетов в удаленном репозитории
+. Чистка артефактов в удаленном репозитории
 . Поддержка нескольких версий Java

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" \
 ]

apps/foo/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.smecalculus.bezmen</groupId>
+    <groupId>smecalculus.bezmen</groupId>
     <artifactId>apps</artifactId>
     <version>${revision}</version>
   </parent>
@@ -15,7 +15,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>core</artifactId>
+      <artifactId>essentials</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -79,7 +79,7 @@
             <id>analyze</id>
             <configuration>
               <usedDependencies>
-                <usedDependency>org.smecalculus.bezmen:construction</usedDependency>
+                <usedDependency>smecalculus.bezmen:construction</usedDependency>
               </usedDependencies>
               <ignoredNonTestScopedDependencies>
                 <ignoredNonTestScopedDependency>org.springframework:spring-beans</ignoredNonTestScopedDependency>

apps/foo/src/main/java/org/smecalculus/bezmen/construction/spec/App.java → 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(

apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoMyBatis.java → 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 {

apps/foo/src/main/java/org/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java → apps/foo/src/main/java/smecalculus/bezmen/data/impl/SepulkaDaoSpringData.java

@@ -1,16 +1,16 @@
-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;
 
 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 {

apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaDao.java → 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 {
 

apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRec.java → 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;

apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/SepulkaRecMapper.java → 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 {

apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/mybatis/SepulkaSqlMapper.java → 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 {
 

apps/foo/src/main/java/org/smecalculus/bezmen/data/spec/springdata/SepulkaRepository.java → 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<SepulkaRec, String> {}

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

apps/foo/src/main/java/org/smecalculus/bezmen/service/impl/SepulkaServiceImpl.java → 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 {
 

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

apps/foo/src/main/java/org/smecalculus/bezmen/messaging/impl/springmvc/SepulkaController.java → 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")