Introduce exterior & interior distinction (#155)

apps/lombok.config

@@ -1,2 +1,2 @@
 lombok.builder.className=Builder
-lombok.addLombokGeneratedAnnotation = true
+lombok.addLombokGeneratedAnnotation=true

apps/pom.xml

@@ -58,14 +58,14 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
     </plugins>
 
     <pluginManagement>
@@ -83,9 +83,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.11.0</version>
           <configuration>
-            <source>17</source>
-            <target>17</target>
-            <encoding>UTF-8</encoding>
+            <release>17</release>
             <annotationProcessorPaths>
               <path>
                 <groupId>org.projectlombok</groupId>
@@ -98,6 +96,9 @@
                 <version>${mapstruct.version}</version>
               </path>
             </annotationProcessorPaths>
+            <compilerArgs>
+              <arg>-Amapstruct.unmappedTargetPolicy=IGNORE</arg>
+            </compilerArgs>
           </configuration>
         </plugin>
         <plugin>
@@ -166,7 +167,6 @@
                 <includes>
                   <include>*.xml</include>
                   <include>*.yml</include>
-                  <include>*.properties</include>
                   <include>Dockerfile</include>
                 </includes>
                 <trimTrailingWhitespace/>

apps/sepuling/Dockerfile

@@ -7,5 +7,5 @@ COPY sepuling*.jar app.jar
 ENTRYPOINT [ \
     "java", "-cp", "app.jar:libs/*", \
     "-Dconfig.file=application.conf", \
-    "smecalculus.bezmen.construction.App" \
+    "smecalculus.bezmen.interior.construction.App" \
 ]

apps/sepuling/src/main/java/smecalculus/bezmen/interior/construction/App.java

@@ -0,0 +1,82 @@
+package smecalculus.bezmen.interior.construction;
+
+import static smecalculus.bezmen.interior.configuration.MessageMappingMode.SPRING_MVC;
+import static smecalculus.bezmen.interior.configuration.StateMappingMode.MY_BATIS;
+import static smecalculus.bezmen.interior.configuration.StateMappingMode.SPRING_DATA;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.PropertySource;
+import smecalculus.bezmen.exterior.messaging.SepulkaClient;
+import smecalculus.bezmen.exterior.messaging.SepulkaMsgMapper;
+import smecalculus.bezmen.exterior.messaging.SepulkaMsgMapperImpl;
+import smecalculus.bezmen.interior.core.SepulkaService;
+import smecalculus.bezmen.interior.core.SepulkaServiceImpl;
+import smecalculus.bezmen.interior.core.SepulkaSliceMapper;
+import smecalculus.bezmen.interior.core.SepulkaSliceMapperImpl;
+import smecalculus.bezmen.interior.messaging.SepulkaClientImpl;
+import smecalculus.bezmen.interior.messaging.springmvc.SepulkaController;
+import smecalculus.bezmen.interior.storage.SepulkaDao;
+import smecalculus.bezmen.interior.storage.SepulkaDaoMyBatis;
+import smecalculus.bezmen.interior.storage.SepulkaDaoSpringData;
+import smecalculus.bezmen.interior.storage.SepulkaRecMapper;
+import smecalculus.bezmen.interior.storage.SepulkaRecMapperImpl;
+import smecalculus.bezmen.interior.storage.mybatis.SepulkaSqlMapper;
+import smecalculus.bezmen.interior.storage.springdata.SepulkaRepository;
+import smecalculus.bezmen.interior.validation.EdgeValidator;
+
+@Import({ValidationBeans.class, ConfigBeans.class, MessagingBeans.class, StorageBeans.class})
+@PropertySource("classpath:application.properties")
+@Configuration(proxyBeanMethods = false)
+public class App {
+
+    public static void main(String[] args) {
+        SpringApplication.run(App.class, args);
+    }
+
+    @Bean
+    @ConditionalOnMessageMappingModes(SPRING_MVC)
+    SepulkaController sepulkaControllerSpringMvc(
+            EdgeValidator validator, SepulkaClient client, SepulkaMsgMapper mapper) {
+        return new SepulkaController(validator, client, mapper);
+    }
+
+    @Bean
+    SepulkaMsgMapper sepulkaMsgMapper() {
+        return new SepulkaMsgMapperImpl();
+    }
+
+    @Bean
+    SepulkaClient sepulkaClient(SepulkaService service, SepulkaSliceMapper mapper) {
+        return new SepulkaClientImpl(service, mapper);
+    }
+
+    @Bean
+    SepulkaService sepulkaService(SepulkaDao sepulkaDao) {
+        return new SepulkaServiceImpl(sepulkaDao);
+    }
+
+    @Bean
+    SepulkaSliceMapper sepulkaSliceMapper() {
+        return new SepulkaSliceMapperImpl();
+    }
+
+    @Bean
+    @ConditionalOnStateMappingMode(SPRING_DATA)
+    SepulkaDaoSpringData sepulkaDaoSpringData(SepulkaRecMapper mapper, SepulkaRepository repository) {
+        return new SepulkaDaoSpringData(mapper, repository);
+    }
+
+    @Bean
+    @ConditionalOnStateMappingMode(MY_BATIS)
+    SepulkaDaoMyBatis sepulkaDaoMyBatis(SepulkaRecMapper recMapper, SepulkaSqlMapper sqlMapper) {
+        return new SepulkaDaoMyBatis(recMapper, sqlMapper);
+    }
+
+    @Bean
+    SepulkaRecMapper sepulkaRecMapper() {
+        return new SepulkaRecMapperImpl();
+    }
+}

apps/sepuling/src/main/java/smecalculus/bezmen/core/SepulkaServiceImpl.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/core/SepulkaServiceImpl.java

@@ -1,18 +1,17 @@
-package smecalculus.bezmen.core;
+package smecalculus.bezmen.interior.core;
 
 import static java.util.UUID.randomUUID;
 
 import java.util.List;
 import lombok.NonNull;
-import smecalculus.bezmen.messaging.client.SepulkaRegReq;
-import smecalculus.bezmen.storage.SepulkaDao;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisterSlice;
+import smecalculus.bezmen.interior.storage.SepulkaDao;
 
 public record SepulkaServiceImpl(@NonNull SepulkaDao sepulkaDao) implements SepulkaService {
 
     @Override
-    public Sepulka register(SepulkaRegReq sepulkaRegReq) {
-        Sepulka sepulka =
-                Sepulka.builder().id(randomUUID()).name(sepulkaRegReq.name()).build();
+    public Sepulka register(SepulkaRegisterSlice slice) {
+        Sepulka sepulka = Sepulka.builder().id(randomUUID()).name(slice.name()).build();
         return sepulkaDao.save(sepulka);
     }
 

apps/sepuling/src/main/java/smecalculus/bezmen/interior/messaging/SepulkaClientImpl.java

@@ -0,0 +1,19 @@
+package smecalculus.bezmen.interior.messaging;
+
+import lombok.NonNull;
+import smecalculus.bezmen.exterior.messaging.SepulkaClient;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisterSlice;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisteredSlice;
+import smecalculus.bezmen.interior.core.Sepulka;
+import smecalculus.bezmen.interior.core.SepulkaService;
+import smecalculus.bezmen.interior.core.SepulkaSliceMapper;
+
+public record SepulkaClientImpl(@NonNull SepulkaService service, @NonNull SepulkaSliceMapper mapper)
+        implements SepulkaClient {
+
+    @Override
+    public SepulkaRegisteredSlice register(SepulkaRegisterSlice request) {
+        Sepulka sepulka = service.register(request);
+        return mapper.toSlice(sepulka);
+    }
+}

apps/sepuling/src/main/java/smecalculus/bezmen/interior/messaging/springmvc/SepulkaController.java

@@ -0,0 +1,30 @@
+package smecalculus.bezmen.interior.messaging.springmvc;
+
+import lombok.NonNull;
+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.exterior.messaging.SepulkaClient;
+import smecalculus.bezmen.exterior.messaging.SepulkaMsgMapper;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisterSlice;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisterSliceMsg;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisteredSlice;
+import smecalculus.bezmen.exterior.messaging.SepulkaRegisteredSliceMsg;
+import smecalculus.bezmen.interior.validation.EdgeValidator;
+
+@RestController
+@RequestMapping("sepulkas")
+public record SepulkaController(
+        @NonNull EdgeValidator validator, @NonNull SepulkaClient client, @NonNull SepulkaMsgMapper mapper) {
+
+    @PostMapping
+    ResponseEntity<SepulkaRegisteredSliceMsg> register(@RequestBody SepulkaRegisterSliceMsg sliceMsg) {
+        validator.validate(sliceMsg);
+        SepulkaRegisterSlice requestSlice = mapper.toDomain(sliceMsg);
+        SepulkaRegisteredSlice responseSlice = client.register(requestSlice);
+        return ResponseEntity.status(HttpStatus.CREATED).body(mapper.toMsg(responseSlice));
+    }
+}

apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDao.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/SepulkaDao.java

@@ -1,8 +1,8 @@
-package smecalculus.bezmen.storage;
+package smecalculus.bezmen.interior.storage;
 
 import java.util.List;
 import java.util.UUID;
-import smecalculus.bezmen.core.Sepulka;
+import smecalculus.bezmen.interior.core.Sepulka;
 
 public interface SepulkaDao {
 

apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoMyBatis.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/SepulkaDaoMyBatis.java

@@ -1,12 +1,12 @@
-package smecalculus.bezmen.storage;
+package smecalculus.bezmen.interior.storage;
 
 import static java.util.stream.Collectors.toList;
 
 import java.util.List;
 import java.util.UUID;
 import lombok.NonNull;
-import smecalculus.bezmen.core.Sepulka;
-import smecalculus.bezmen.storage.mybatis.SepulkaSqlMapper;
+import smecalculus.bezmen.interior.core.Sepulka;
+import smecalculus.bezmen.interior.storage.mybatis.SepulkaSqlMapper;
 
 public record SepulkaDaoMyBatis(@NonNull SepulkaRecMapper recMapper, @NonNull SepulkaSqlMapper sqlMapper)
         implements SepulkaDao {

apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaDaoSpringData.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/SepulkaDaoSpringData.java

@@ -1,13 +1,13 @@
-package smecalculus.bezmen.storage;
+package smecalculus.bezmen.interior.storage;
 
 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 smecalculus.bezmen.core.Sepulka;
-import smecalculus.bezmen.storage.springdata.SepulkaRepository;
+import smecalculus.bezmen.interior.core.Sepulka;
+import smecalculus.bezmen.interior.storage.springdata.SepulkaRepository;
 
 public record SepulkaDaoSpringData(@NonNull SepulkaRecMapper mapper, @NonNull SepulkaRepository repository)
         implements SepulkaDao {

apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRec.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/SepulkaRec.java

@@ -1,4 +1,4 @@
-package smecalculus.bezmen.storage;
+package smecalculus.bezmen.interior.storage;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;

apps/sepuling/src/main/java/smecalculus/bezmen/storage/SepulkaRecMapper.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/SepulkaRecMapper.java

@@ -1,7 +1,7 @@
-package smecalculus.bezmen.storage;
+package smecalculus.bezmen.interior.storage;
 
 import org.mapstruct.Mapper;
-import smecalculus.bezmen.core.Sepulka;
+import smecalculus.bezmen.interior.core.Sepulka;
 
 @Mapper
 public interface SepulkaRecMapper {

apps/sepuling/src/main/java/smecalculus/bezmen/storage/mybatis/SepulkaSqlMapper.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/mybatis/SepulkaSqlMapper.java

@@ -1,11 +1,11 @@
-package smecalculus.bezmen.storage.mybatis;
+package smecalculus.bezmen.interior.storage.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 smecalculus.bezmen.storage.SepulkaRec;
+import smecalculus.bezmen.interior.storage.SepulkaRec;
 
 public interface SepulkaSqlMapper {
 

apps/sepuling/src/main/java/smecalculus/bezmen/storage/springdata/SepulkaRepository.java → apps/sepuling/src/main/java/smecalculus/bezmen/interior/storage/springdata/SepulkaRepository.java

@@ -1,6 +1,6 @@
-package smecalculus.bezmen.storage.springdata;
+package smecalculus.bezmen.interior.storage.springdata;
 
 import org.springframework.data.repository.CrudRepository;
-import smecalculus.bezmen.storage.SepulkaRec;
+import smecalculus.bezmen.interior.storage.SepulkaRec;
 
 public interface SepulkaRepository extends CrudRepository<SepulkaRec, String> {}