Decompose properties files

smecalculus · Oct 5, 2023 · a511af6 · a511af6
1 parent 28956cd
commit a511af6
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 47 deletions.
diff --git a/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java b/apps/foo/src/main/java/smecalculus/bezmen/construction/App.java
@@ -8,6 +8,7 @@
 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.core.SepulkaConverter;
 import smecalculus.bezmen.core.SepulkaConverterImpl;
 import smecalculus.bezmen.core.SepulkaService;
@@ -27,6 +28,7 @@
 import smecalculus.bezmen.validation.EdgeValidator;
 
 @Import({ConfigBeans.class, ValidationBeans.class, MessagingBeans.class, StorageBeans.class})
+@PropertySource("classpath:application.properties")
 @Configuration(proxyBeanMethods = false)
 public class App {
 

diff --git a/apps/foo/src/main/resources/application.properties b/apps/foo/src/main/resources/application.properties
diff --git a/apps/foo/src/main/resources/application.yaml b/apps/foo/src/main/resources/application.yaml
diff --git a/apps/foo/src/main/resources/reference.conf b/apps/foo/src/main/resources/reference.conf
diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingCfgMapper.java b/libs/messaging/src/main/java/smecalculus/bezmen/configuration/MessagingCfgMapper.java
@@ -8,13 +8,13 @@ public interface MessagingCfgMapper {
 
     @Mapping(source = "protocol", target = "protocolProps")
     @Mapping(source = "mapping", target = "mappingProps")
-    MessagingProps toDomain(MessagingPropsCfg messagingPropsCfg);
+    MessagingProps toDomain(MessagingPropsCfg propsCfg);
 
     @Mapping(source = "modes", target = "protocolModes")
-    MessagingProtocolProps toDomain(MessagingProtocolPropsCfg protocolPropsCfg);
+    MessagingProtocolProps toDomain(MessagingProtocolPropsCfg propsCfg);
 
     @Mapping(source = "modes", target = "mappingModes")
-    MessageMappingProps toDomain(MessageMappingPropsCfg mappingPropsCfg);
+    MessageMappingProps toDomain(MessageMappingPropsCfg propsCfg);
 
     default MessagingProtocolMode toProtocolMode(String value) {
         return MessagingProtocolMode.valueOf(value.toUpperCase());

diff --git a/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java b/libs/messaging/src/main/java/smecalculus/bezmen/construction/MessagingConfigBeans.java
@@ -4,13 +4,15 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import smecalculus.bezmen.configuration.ConfigKeeper;
 import smecalculus.bezmen.configuration.MessagingCfgMapper;
 import smecalculus.bezmen.configuration.MessagingCfgMapperImpl;
 import smecalculus.bezmen.configuration.MessagingProps;
 import smecalculus.bezmen.configuration.MessagingPropsCfg;
 import smecalculus.bezmen.validation.EdgeValidator;
 
+@PropertySource("classpath:messaging.properties")
 @Configuration(proxyBeanMethods = false)
 public class MessagingConfigBeans {
 

diff --git a/libs/messaging/src/main/resources/messaging.properties b/libs/messaging/src/main/resources/messaging.properties
@@ -0,0 +1,2 @@
+bezmen.messaging.protocol.modes[0]=http
+bezmen.messaging.mapping.modes[0]=spring_mvc
diff --git a/libs/messaging/src/main/resources/messaging.yaml b/libs/messaging/src/main/resources/messaging.yaml
diff --git a/libs/messaging/src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java b/libs/messaging/src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansIT.java
@@ -11,15 +11,15 @@
 import smecalculus.bezmen.configuration.MessagingProps;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {ConfigBeans.class, ValidationBeans.class, MessagingConfigBeans.class})
-class MessagingConfigBeansIT {
+@ContextConfiguration(classes = {MessagingConfigBeans.class, ConfigBeans.class, ValidationBeans.class})
+abstract class MessagingConfigBeansIT {
 
     @Test
     void defaultConfigShouldBeBackwardCompatible(@Autowired MessagingProps actualProps) {
         // given
         MessagingProps expectedProps = messagingProps().build();
         // when
-        // construction
+        // default construction
         // then
         assertThat(actualProps).isEqualTo(expectedProps);
     }

diff --git a/.../src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java b/.../src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansLightbendConfigIT.java
@@ -0,0 +1,6 @@
+package smecalculus.bezmen.construction;
+
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(properties = {"bezmen.config.mapping.mode=lightbend_config"})
+class MessagingConfigBeansLightbendConfigIT extends MessagingConfigBeansIT {}
diff --git a/...ing/src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java b/...ing/src/test/java/smecalculus/bezmen/construction/MessagingConfigBeansSpringConfigIT.java
@@ -0,0 +1,6 @@
+package smecalculus.bezmen.construction;
+
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(properties = {"bezmen.config.mapping.mode=spring_config"})
+class MessagingConfigBeansSpringConfigIT extends MessagingConfigBeansIT {}
diff --git a/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageCfgMapper.java b/libs/storage/src/main/java/smecalculus/bezmen/configuration/StorageCfgMapper.java
@@ -8,7 +8,7 @@ public interface StorageCfgMapper {
 
     @Mapping(source = "protocol", target = "protocolProps")
     @Mapping(source = "mapping", target = "mappingProps")
-    StorageProps toDomain(StoragePropsCfg storagePropsCfg);
+    StorageProps toDomain(StoragePropsCfg propsCfg);
 
     @Mapping(source = "mode", target = "protocolMode")
     @Mapping(source = "h2", target = "h2Props")

diff --git a/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java b/libs/storage/src/main/java/smecalculus/bezmen/construction/StorageConfigBeans.java
@@ -4,13 +4,15 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import smecalculus.bezmen.configuration.ConfigKeeper;
 import smecalculus.bezmen.configuration.StorageCfgMapper;
 import smecalculus.bezmen.configuration.StorageCfgMapperImpl;
 import smecalculus.bezmen.configuration.StorageProps;
 import smecalculus.bezmen.configuration.StoragePropsCfg;
 import smecalculus.bezmen.validation.EdgeValidator;
 
+@PropertySource("classpath:storage.properties")
 @Configuration(proxyBeanMethods = false)
 public class StorageConfigBeans {
 

diff --git a/libs/storage/src/main/resources/storage.properties b/libs/storage/src/main/resources/storage.properties
@@ -0,0 +1,8 @@
+bezmen.storage.protocol.mode=h2
+bezmen.storage.protocol.h2.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+bezmen.storage.protocol.h2.username=sa
+bezmen.storage.protocol.h2.password=sa
+bezmen.storage.protocol.postgres.url=jdbc:postgresql://localhost:5432/bezmen
+bezmen.storage.protocol.postgres.username=bezmen
+bezmen.storage.protocol.postgres.password=bezmen
+bezmen.storage.mapping.mode=spring_data
diff --git a/libs/storage/src/main/resources/storage.yaml b/libs/storage/src/main/resources/storage.yaml
diff --git a/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java b/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansIT.java
@@ -11,15 +11,15 @@
 import smecalculus.bezmen.configuration.StorageProps;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {ConfigBeans.class, ValidationBeans.class, StorageConfigBeans.class})
-class StorageConfigBeansIT {
+@ContextConfiguration(classes = {StorageConfigBeans.class, ConfigBeans.class, ValidationBeans.class})
+abstract class StorageConfigBeansIT {
 
     @Test
     void defaultConfigShouldBeBackwardCompatible(@Autowired StorageProps actualProps) {
         // given
         StorageProps expectedProps = storageProps().build();
         // when
-        // construction
+        // default construction
         // then
         assertThat(actualProps).isEqualTo(expectedProps);
     }

diff --git a/...ge/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java b/...ge/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansLightbendConfigIT.java
@@ -0,0 +1,6 @@
+package smecalculus.bezmen.construction;
+
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(properties = {"bezmen.config.mapping.mode=lightbend_config"})
+class StorageConfigBeansLightbendConfigIT extends StorageConfigBeansIT {}
diff --git a/...orage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java b/...orage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansSpringConfigIT.java
@@ -0,0 +1,6 @@
+package smecalculus.bezmen.construction;
+
+import org.springframework.test.context.TestPropertySource;
+
+@TestPropertySource(properties = {"bezmen.config.mapping.mode=spring_config"})
+class StorageConfigBeansSpringConfigIT extends StorageConfigBeansIT {}
diff --git a/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java b/libs/storage/src/test/java/smecalculus/bezmen/construction/StorageConfigBeansTest.java
@@ -15,28 +15,26 @@
 
 class StorageConfigBeansTest {
 
-    private StorageConfigBeans configBeans;
+    private final StorageConfigBeans config = new StorageConfigBeans();
+    private final StorageCfgMapper mapper = new StorageCfgMapperImpl();
     private EdgeValidator validatorMock;
     private ConfigKeeper keeperMock;
-    private StorageCfgMapper mapper;
 
     @BeforeEach
     void setUp() {
-        configBeans = new StorageConfigBeans();
         validatorMock = mock(EdgeValidator.class);
         keeperMock = mock(ConfigKeeper.class);
-        mapper = new StorageCfgMapperImpl();
     }
 
     @Test
     void shouldValidateConf() {
         // given
-        StoragePropsCfg expectedStorageProps = storagePropsCfg();
+        StoragePropsCfg expectedProps = storagePropsCfg();
         // and
-        when(keeperMock.read("bezmen.storage", StoragePropsCfg.class)).thenReturn(expectedStorageProps);
+        when(keeperMock.read("bezmen.storage", StoragePropsCfg.class)).thenReturn(expectedProps);
         // when
-        configBeans.storageProps(keeperMock, validatorMock, mapper);
+        config.storageProps(keeperMock, validatorMock, mapper);
         // then
-        verify(validatorMock).validate(expectedStorageProps);
+        verify(validatorMock).validate(expectedProps);
     }
 }
diff --git a/solutions/basis/compose.yml b/solutions/basis/compose.yml
@@ -88,7 +88,7 @@ services:
         target: /home/bezmen/${CONFIG_FILE_NAME}
     command: >
       --bezmen.config.mapping.mode=${CONFIG_MAPPING_MODE}
-      --spring.config.location=classpath:application.yaml,optional:file:${CONFIG_FILE_NAME}
+      --spring.config.location=optional:file:${CONFIG_FILE_NAME}
     depends_on:
       schema-owner:
         condition: service_completed_successfully
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bezmen.messaging.protocol.modes[0]=http
		bezmen.messaging.mapping.modes[0]=spring_mvc