#301 - Added implementation for mapper [skip ci]

starnowski · Mar 5, 2024 · 37e4af4 · 37e4af4
1 parent 7420227
commit 37e4af4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.../starnowski/posmulten/configuration/yaml/dao/SharedSchemaContextConfigurationYamlDao.java b/.../starnowski/posmulten/configuration/yaml/dao/SharedSchemaContextConfigurationYamlDao.java
@@ -29,10 +29,12 @@
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.github.starnowski.posmulten.configuration.yaml.exceptions.YamlInvalidSchema;
 import com.github.starnowski.posmulten.configuration.yaml.model.SharedSchemaContextConfiguration;
+import com.github.starnowski.posmulten.configuration.yaml.validation.groups.ValidatorGroupsResolver;
 import org.hibernate.validator.internal.engine.path.NodeImpl;
 import org.hibernate.validator.internal.engine.path.PathImpl;
 
 import javax.validation.*;
+import javax.validation.groups.Default;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -75,7 +77,11 @@ public void save(SharedSchemaContextConfiguration configuration, String filePath
     private void validateConfigurationObject(SharedSchemaContextConfiguration configuration) throws YamlInvalidSchema {
         ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
         Validator validator = factory.getValidator();
-        Set<ConstraintViolation<SharedSchemaContextConfiguration>> errors = validator.validate(configuration);
+        ValidatorGroupsResolver validatorGroupsResolver = new ValidatorGroupsResolver();
+        List<Class> validationGroupsList = validatorGroupsResolver.resolveForSharedSchemaContextConfiguration(configuration, null);
+        validationGroupsList.add(Default.class);
+        Class[] validationGroups = validationGroupsList.toArray(new Class[0]);
+        Set<ConstraintViolation<SharedSchemaContextConfiguration>> errors = validator.validate(configuration, validationGroups);
         if (!errors.isEmpty()) {
             throw new YamlInvalidSchema(prepareErrorsMessages(errors));
         }

diff --git a/...arnowski/posmulten/configuration/yaml/mappers/SharedSchemaContextConfigurationMapper.java b/...arnowski/posmulten/configuration/yaml/mappers/SharedSchemaContextConfigurationMapper.java
@@ -39,6 +39,7 @@ public class SharedSchemaContextConfigurationMapper implements IConfigurationMap
     @Override
     public SharedSchemaContextConfiguration map(com.github.starnowski.posmulten.configuration.core.model.SharedSchemaContextConfiguration input) {
         return input == null ? null : new SharedSchemaContextConfiguration()
+                .setCreateForeignKeyConstraintWithTenantColumn(input.getCreateForeignKeyConstraintWithTenantColumn())
                 .setCurrentTenantIdentifierAsDefaultValueForTenantColumnInAllTables(input.getCurrentTenantIdentifierAsDefaultValueForTenantColumnInAllTables())
                 .setCurrentTenantIdProperty(input.getCurrentTenantIdProperty() == null ? null : valueOf(input.getCurrentTenantIdProperty()))
                 .setCurrentTenantIdPropertyType(input.getCurrentTenantIdPropertyType() == null ? null : valueOf(input.getCurrentTenantIdPropertyType()))
@@ -59,6 +60,7 @@ public SharedSchemaContextConfiguration map(com.github.starnowski.posmulten.conf
     @Override
     public com.github.starnowski.posmulten.configuration.core.model.SharedSchemaContextConfiguration unmap(SharedSchemaContextConfiguration output) {
         return output == null ? null : new com.github.starnowski.posmulten.configuration.core.model.SharedSchemaContextConfiguration()
+                .setCreateForeignKeyConstraintWithTenantColumn(output.getCreateForeignKeyConstraintWithTenantColumn())
                 .setCurrentTenantIdentifierAsDefaultValueForTenantColumnInAllTables(output.getCurrentTenantIdentifierAsDefaultValueForTenantColumnInAllTables())
                 .setCurrentTenantIdProperty(output.getCurrentTenantIdProperty() == null ? null : output.getCurrentTenantIdProperty().getValue())
                 .setCurrentTenantIdPropertyType(output.getCurrentTenantIdPropertyType() == null ? null : output.getCurrentTenantIdPropertyType().getValue())

diff --git a/...n/java/com/github/starnowski/posmulten/configuration/yaml/model/PrimaryKeyDefinition.java b/...n/java/com/github/starnowski/posmulten/configuration/yaml/model/PrimaryKeyDefinition.java
@@ -49,5 +49,5 @@ public class PrimaryKeyDefinition {
     @JsonProperty(value = "name_for_function_that_checks_if_record_exists_in_table")
     private String nameForFunctionThatChecksIfRecordExistsInTable;
 
-    public static class NameForFunctionThatChecksIfRecordExistsInTableNotBlank {}
+    public interface NameForFunctionThatChecksIfRecordExistsInTableNotBlank {}
 }
diff --git a/...rnowski/posmulten/configuration/yaml/validation/groups/ValidatorGroupsResolverTest.groovy b/...rnowski/posmulten/configuration/yaml/validation/groups/ValidatorGroupsResolverTest.groovy
@@ -25,7 +25,7 @@ class ValidatorGroupsResolverTest extends Specification {
             def vgr1 = Mock(ValidatorGroupResolver)
             def vgr2 = Mock(ValidatorGroupResolver)
             def tested = new ValidatorGroupsResolver([vgr1, vgr2])
-            def sharedSchemaContextConfiguration = Mock(SharedSchemaContextConfiguration)
+            def sharedSchemaContextConfiguration = new SharedSchemaContextConfiguration()
             def validatorGroupResolverContext = Mock(ValidatorGroupResolver.ValidatorGroupResolverContext)
 
         when: