Use var keyword and add validation props

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

@@ -25,7 +25,7 @@ public Sepulka getById(@NonNull UUID id) {
 
     @Override
     public Sepulka save(@NonNull Sepulka sepulka) {
-        SepulkaEdge sepulkaEdge = stateMapper.toEdge(sepulka);
+        var sepulkaEdge = stateMapper.toEdge(sepulka);
         sqlMapper.insert(sepulkaEdge);
         return sepulka;
     }

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

@@ -26,8 +26,8 @@ public Sepulka getById(@NonNull UUID id) {
 
     @Override
     public Sepulka save(@NonNull Sepulka sepulka) {
-        SepulkaEdge newSepulkaEdge = mapper.toEdge(sepulka);
-        SepulkaEdge savedSepulkaEdge = repository.save(newSepulkaEdge);
+        var newSepulkaEdge = mapper.toEdge(sepulka);
+        var savedSepulkaEdge = repository.save(newSepulkaEdge);
         return mapper.toDomain(savedSepulkaEdge);
     }
 

apps/sepuling/src/test/java/smecalculus/bezmen/construction/SepulkaDaoBeans.java

@@ -31,13 +31,13 @@ public class SepulkaDaoBeans {
 
     @Bean
     public DataSource dataSource(StorageProps storageProps) {
-        List<String> common = List.of("DB_CLOSE_DELAY=-1");
-        List<String> specific =
+        var common = List.of("DB_CLOSE_DELAY=-1");
+        var specific =
                 switch (storageProps.protocolProps().protocolMode()) {
                     case H2 -> List.of("MODE=STRICT");
                     case POSTGRES -> List.of("MODE=PostgreSQL", "DATABASE_TO_LOWER=TRUE", "DEFAULT_NULL_ORDERING=HIGH");
                 };
-        String nameWithSettings = Stream.of(List.of(DB), common, specific)
+        var nameWithSettings = Stream.of(List.of(DB), common, specific)
                 .flatMap(Collection::stream)
                 .collect(joining(";"));
         return new EmbeddedDatabaseBuilder()

apps/sepuling/src/test/java/smecalculus/bezmen/storage/SepulkaDaoIT.java

@@ -10,7 +10,6 @@
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import smecalculus.bezmen.construction.SepulkaDaoBeans;
-import smecalculus.bezmen.core.Sepulka;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = SepulkaDaoBeans.class)
@@ -23,11 +22,11 @@ abstract class SepulkaDaoIT {
     @Test
     void shouldSaveOneSepulka() {
         // given
-        Sepulka expectedSepulka = sepulka();
+        var expectedSepulka = sepulka();
         // when
-        Sepulka actualSepulka1 = sepulkaDao.save(expectedSepulka);
+        var actualSepulka1 = sepulkaDao.save(expectedSepulka);
         // and
-        Sepulka actualSepulka2 = sepulkaDao.getById(expectedSepulka.id());
+        var actualSepulka2 = sepulkaDao.getById(expectedSepulka.id());
         // then
         assertThat(actualSepulka1).isEqualTo(expectedSepulka);
         // and

libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationMode.java

@@ -0,0 +1,5 @@
+package smecalculus.bezmen.configuration;
+
+public enum ValidationMode {
+    HIBERNATE_VALIDATOR
+}

libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationProps.java

@@ -0,0 +1,7 @@
+package smecalculus.bezmen.configuration;
+
+import lombok.Builder;
+import lombok.NonNull;
+
+@Builder
+public record ValidationProps(@NonNull ValidationMode validationMode) {}

libs/essentials/src/main/java/smecalculus/bezmen/configuration/ValidationPropsEdge.java

@@ -0,0 +1,8 @@
+package smecalculus.bezmen.configuration;
+
+import lombok.Data;
+
+@Data
+public class ValidationPropsEdge {
+    private String mode;
+}

libs/essentials/src/main/java/smecalculus/bezmen/construction/ConditionalOnValidationMode.java

@@ -0,0 +1,15 @@
+package smecalculus.bezmen.construction;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.springframework.context.annotation.Conditional;
+import smecalculus.bezmen.configuration.ValidationMode;
+
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Conditional(ValidationModeCondition.class)
+public @interface ConditionalOnValidationMode {
+    ValidationMode value();
+}

libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigMappingModeCondition.java

@@ -2,7 +2,7 @@
 
 import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
 
-import java.util.Map;
+import lombok.NonNull;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.ConfigurationCondition;
 import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -12,16 +12,15 @@ class ConfigMappingModeCondition implements ConfigurationCondition {
 
     @Override
     public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        Map<String, Object> attributes =
-                metadata.getAnnotationAttributes(ConditionalOnConfigMappingMode.class.getName());
-        ConfigMappingMode expectedMode = (ConfigMappingMode) attributes.get("value");
+        var attributes = metadata.getAnnotationAttributes(ConditionalOnConfigMappingMode.class.getName());
+        var expectedMode = (ConfigMappingMode) attributes.get("value");
         String actualMode = context.getEnvironment()
                 .getProperty("bezmen.config.mapping.mode", ConfigMappingMode.LIGHTBEND_CONFIG.name());
         return expectedMode.name().equalsIgnoreCase(actualMode);
     }
 
     @Override
-    public ConfigurationPhase getConfigurationPhase() {
+    public @NonNull ConfigurationPhase getConfigurationPhase() {
         return REGISTER_BEAN;
     }
 }

libs/essentials/src/main/java/smecalculus/bezmen/construction/ConfigProtocolModeCondition.java

@@ -3,6 +3,7 @@
 import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
 
 import java.util.Map;
+import lombok.NonNull;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.ConfigurationCondition;
 import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -14,14 +15,14 @@ class ConfigProtocolModeCondition implements ConfigurationCondition {
     public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
         Map<String, Object> attributes =
                 metadata.getAnnotationAttributes(ConditionalOnConfigProtocolMode.class.getName());
-        ConfigProtocolMode expectedMode = (ConfigProtocolMode) attributes.get("value");
+        var expectedMode = (ConfigProtocolMode) attributes.get("value");
         String actualMode = context.getEnvironment()
                 .getProperty("bezmen.config.protocol.mode", ConfigProtocolMode.FILE_SYSTEM.name());
         return expectedMode.name().equalsIgnoreCase(actualMode);
     }
 
     @Override
-    public ConfigurationPhase getConfigurationPhase() {
+    public @NonNull ConfigurationPhase getConfigurationPhase() {
         return REGISTER_BEAN;
     }
 }

libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationBeans.java

@@ -1,18 +1,38 @@
 package smecalculus.bezmen.construction;
 
+import static java.util.Objects.requireNonNull;
+import static smecalculus.bezmen.configuration.ValidationMode.HIBERNATE_VALIDATOR;
+
 import jakarta.validation.Validation;
-import jakarta.validation.ValidatorFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import smecalculus.bezmen.configuration.PropsKeeper;
+import smecalculus.bezmen.configuration.ValidationProps;
+import smecalculus.bezmen.configuration.ValidationPropsEdge;
 import smecalculus.bezmen.validation.EdgeValidator;
 import smecalculus.bezmen.validation.EdgeValidatorHibernateValidator;
+import smecalculus.bezmen.validation.ValidationPropsMapper;
 
 @Configuration(proxyBeanMethods = false)
 public class ValidationBeans {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ValidationBeans.class);
+
+    @Bean
+    ValidationProps validationProps(PropsKeeper keeper, ValidationPropsMapper mapper) {
+        var propsEdge = keeper.read("bezmen.validation", ValidationPropsEdge.class);
+        requireNonNull(propsEdge.getMode(), "validation mode must not be null");
+        LOG.info("Read {}", propsEdge);
+        return mapper.toDomain(propsEdge);
+    }
+
     @Bean
+    @ConditionalOnValidationMode(HIBERNATE_VALIDATOR)
     EdgeValidator edgeValidatorHibernateValidator() {
-        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-        return new EdgeValidatorHibernateValidator(factory.getValidator());
+        try (var factory = Validation.buildDefaultValidatorFactory()) {
+            return new EdgeValidatorHibernateValidator(factory.getValidator());
+        }
     }
 }

libs/essentials/src/main/java/smecalculus/bezmen/construction/ValidationModeCondition.java

@@ -0,0 +1,26 @@
+package smecalculus.bezmen.construction;
+
+import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
+
+import lombok.NonNull;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.context.annotation.ConfigurationCondition;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import smecalculus.bezmen.configuration.ValidationMode;
+import smecalculus.bezmen.configuration.ValidationProps;
+
+class ValidationModeCondition implements ConfigurationCondition {
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        var attributes = metadata.getAnnotationAttributes(ConditionalOnValidationMode.class.getName());
+        var mode = (ValidationMode) attributes.get("value");
+        var props = context.getBeanFactory().getBean(ValidationProps.class);
+        return mode == props.validationMode();
+    }
+
+    @Override
+    public @NonNull ConfigurationPhase getConfigurationPhase() {
+        return REGISTER_BEAN;
+    }
+}

libs/essentials/src/main/java/smecalculus/bezmen/validation/EdgeValidatorHibernateValidator.java

@@ -1,9 +1,7 @@
 package smecalculus.bezmen.validation;
 
-import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.Validator;
-import java.util.Set;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
@@ -15,7 +13,7 @@ public class EdgeValidatorHibernateValidator implements EdgeValidator {
 
     @Override
     public <T> void validate(T object, Class<?>... groups) {
-        Set<ConstraintViolation<T>> violations = validator.validate(object, groups);
+        var violations = validator.validate(object, groups);
         if (!violations.isEmpty()) {
             throw new ConstraintViolationException(violations);
         }

libs/essentials/src/main/java/smecalculus/bezmen/validation/ValidationPropsMapper.java

@@ -0,0 +1,15 @@
+package smecalculus.bezmen.validation;
+
+import org.mapstruct.Mapping;
+import smecalculus.bezmen.configuration.ValidationMode;
+import smecalculus.bezmen.configuration.ValidationProps;
+import smecalculus.bezmen.configuration.ValidationPropsEdge;
+
+public interface ValidationPropsMapper {
+    @Mapping(source = "mode", target = "validationMode")
+    ValidationProps toDomain(ValidationPropsEdge propsEdge);
+
+    default ValidationMode toValidationMode(String value) {
+        return ValidationMode.valueOf(value.toUpperCase());
+    }
+}

libs/essentials/src/main/resources/reference.conf

@@ -0,0 +1,5 @@
+bezmen {
+  validation {
+    mode = hibernate_validator
+  }
+}

libs/essentials/src/main/resources/validation.properties

@@ -0,0 +1 @@
+bezmen.validation.mode=hibernate_validator

libs/messaging/src/main/java/smecalculus/bezmen/construction/MessageMappingModeCondition.java

@@ -2,9 +2,8 @@
 
 import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
 
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Stream;
+import lombok.NonNull;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.ConfigurationCondition;
 import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -15,16 +14,15 @@ class MessageMappingModeCondition implements ConfigurationCondition {
 
     @Override
     public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        Map<String, Object> attributes =
-                metadata.getAnnotationAttributes(ConditionalOnMessageMappingModes.class.getName());
-        MessageMappingMode[] expectedModes = (MessageMappingMode[]) attributes.get("value");
-        MessagingProps messagingProps = context.getBeanFactory().getBean(MessagingProps.class);
-        Set<MessageMappingMode> actualModes = messagingProps.mappingProps().mappingModes();
+        var attributes = metadata.getAnnotationAttributes(ConditionalOnMessageMappingModes.class.getName());
+        var expectedModes = (MessageMappingMode[]) attributes.get("value");
+        var props = context.getBeanFactory().getBean(MessagingProps.class);
+        var actualModes = props.mappingProps().mappingModes();
         return Stream.of(expectedModes).anyMatch(actualModes::contains);
     }
 
     @Override
-    public ConfigurationPhase getConfigurationPhase() {
+    public @NonNull ConfigurationPhase getConfigurationPhase() {
         return REGISTER_BEAN;
     }
 }

libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java

@@ -25,7 +25,7 @@ MessagingPropsMapper messagingPropsMapper() {
 
     @Bean
     MessagingProps messagingProps(PropsKeeper keeper, EdgeValidator validator, MessagingPropsMapper mapper) {
-        MessagingPropsEdge propsEdge = keeper.read("bezmen.messaging", MessagingPropsEdge.class);
+        var propsEdge = keeper.read("bezmen.messaging", MessagingPropsEdge.class);
         validator.validate(propsEdge);
         LOG.info("Read {}", propsEdge);
         return mapper.toDomain(propsEdge);

libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingProtocolModeCondition.java

@@ -2,9 +2,8 @@
 
 import static org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN;
 
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Stream;
+import lombok.NonNull;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.ConfigurationCondition;
 import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -15,16 +14,15 @@ class MessagingProtocolModeCondition implements ConfigurationCondition {
 
     @Override
     public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        Map<String, Object> attributes =
-                metadata.getAnnotationAttributes(ConditionalOnMessagingProtocolModes.class.getName());
-        MessagingProtocolMode[] expectedModes = (MessagingProtocolMode[]) attributes.get("value");
-        MessagingProps messagingProps = context.getBeanFactory().getBean(MessagingProps.class);
-        Set<MessagingProtocolMode> actualModes = messagingProps.protocolProps().protocolModes();
+        var attributes = metadata.getAnnotationAttributes(ConditionalOnMessagingProtocolModes.class.getName());
+        var expectedModes = (MessagingProtocolMode[]) attributes.get("value");
+        var props = context.getBeanFactory().getBean(MessagingProps.class);
+        var actualModes = props.protocolProps().protocolModes();
         return Stream.of(expectedModes).anyMatch(actualModes::contains);
     }
 
     @Override
-    public ConfigurationPhase getConfigurationPhase() {
+    public @NonNull ConfigurationPhase getConfigurationPhase() {
         return REGISTER_BEAN;
     }
 }

libs/messaging/src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java

@@ -17,7 +17,7 @@ abstract class MessagingConfigBeansIT {
     @Test
     void defaultConfigShouldBeBackwardCompatible(@Autowired MessagingProps actualProps) {
         // given
-        MessagingProps expectedProps = messagingProps().build();
+        var expectedProps = messagingProps().build();
         // when
         // default construction
         // then

libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingProps.java

@@ -1,6 +1,7 @@
 package smecalculus.bezmen.configuration;
 
 import lombok.Builder;
+import lombok.NonNull;
 
 @Builder
-public record StateMappingProps(StateMappingMode mappingMode) {}
+public record StateMappingProps(@NonNull StateMappingMode mappingMode) {}

libs/storage/src/main/java/smecalculus/bezmen/configuration/StateMappingPropsEg.java

@@ -5,7 +5,7 @@
 public class StateMappingPropsEg {
     public static class Pojos {
         public static StateMappingPropsEdge stateMappingPropsEdge() {
-            StateMappingPropsEdge propsEdge = new StateMappingPropsEdge();
+            var propsEdge = new StateMappingPropsEdge();
             propsEdge.setMode(SPRING_DATA.name());
             return propsEdge;
         }

libs/storage/src/main/java/smecalculus/bezmen/configuration/StoragePropsEg.java

@@ -8,7 +8,7 @@
 public class StoragePropsEg {
     public static class Pojos {
         public static StoragePropsEdge storagePropsEdge() {
-            StoragePropsEdge propsEdge = new StoragePropsEdge();
+            var propsEdge = new StoragePropsEdge();
             propsEdge.setProtocol(storageProtocolPropsEdge());
             propsEdge.setMapping(stateMappingPropsEdge());
             return propsEdge;

libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageProtocolPropsEg.java

@@ -3,7 +3,7 @@
 public class StorageProtocolPropsEg {
     public static class Pojos {
         public static StorageProtocolPropsEdge storageProtocolPropsEdge() {
-            StorageProtocolPropsEdge propsEdge = new StorageProtocolPropsEdge();
+            var propsEdge = new StorageProtocolPropsEdge();
             propsEdge.setMode(StorageProtocolMode.H2.name());
             return propsEdge;
         }

libs/storage/src/main/java/smecalculus/bezmen/construction/MappingMyBatisBeans.java

@@ -16,7 +16,7 @@ public class MappingMyBatisBeans {
 
     @Bean
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
+        var factoryBean = new SqlSessionFactoryBean();
         factoryBean.setDataSource(dataSource);
         return factoryBean.getObject();
     }