Wip

Author: Jonas-Isr

datamodel/odata/odata-generator/pom.xml

@@ -147,6 +147,11 @@
 			<!-- required for code generation at runtime -->
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.10.1</version> <!-- Use latest stable version -->
+		</dependency>
 		<!-- scope "test" -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java

@@ -24,6 +24,9 @@
 
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -292,25 +295,45 @@ private void cleanDirectory( final File outputDir )
 
     private PropertiesConfiguration loadPropertiesConfiguration( final File serviceMappingsFile )
     {
+        FileBasedConfigurationBuilder<PropertiesConfiguration> configurationBuilder =
+            loadPropertiesConfigurationBuilder(serviceMappingsFile);
         final PropertiesConfiguration serviceNameMappings;
+        try {
+            serviceNameMappings = configurationBuilder.getConfiguration();
+        }
+        catch( final ConfigurationException e ) {
+            throw new ODataGeneratorReadException(e);
+        }
+        return serviceNameMappings;
+    }
+
+    private FileBasedConfigurationBuilder<PropertiesConfiguration> loadPropertiesConfigurationBuilder(
+        final File serviceMappingsFile )
+    {
+        final PropertiesConfiguration serviceNameMappings;
+        FileBasedConfigurationBuilder<PropertiesConfiguration> configurationBuilder;
         try {
             if( serviceMappingsFile.exists() ) {
-                serviceNameMappings = new PropertiesConfiguration(serviceMappingsFile);
+                configurationBuilder =
+                    new FileBasedConfigurationBuilder<>(PropertiesConfiguration.class)
+                        .configure(new Parameters().fileBased().setFile(serviceMappingsFile));
             } else {
-                serviceNameMappings = new PropertiesConfiguration();
+                configurationBuilder = new FileBasedConfigurationBuilder<>(PropertiesConfiguration.class);
             }
+            serviceNameMappings = configurationBuilder.getConfiguration();
         }
         catch( final ConfigurationException e ) {
             throw new ODataGeneratorReadException(e);
         }
 
         sanitizeConfiguration(serviceNameMappings);
 
-        return serviceNameMappings;
+        return configurationBuilder;
     }
 
     private void sanitizeConfiguration( final Configuration configuration )
     {
+//        configuration.key
         for( final Iterator<String> it = configuration.getKeys(); it.hasNext(); ) {
             final String key = it.next();
 
@@ -330,20 +353,27 @@ private void sanitizeConfiguration( final Configuration configuration )
     private void storeConfiguration( final File serviceMappingsFile, final Iterable<Service> allODataServices )
     {
         ensureFileExists(serviceMappingsFile);
-        final PropertiesConfiguration serviceNameMappings = loadPropertiesConfiguration(serviceMappingsFile);
+        final var configurationBuilder = loadPropertiesConfigurationBuilder(serviceMappingsFile);
+        final PropertiesConfiguration serviceNameMappings;
+        try {
+            serviceNameMappings = configurationBuilder.getConfiguration();
+        }
+        catch( final ConfigurationException e ) {
+            throw new ODataGeneratorReadException(e);
+        }
 
         for( final Service oDataService : allODataServices ) {
             final String javaClassNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_CLASS_SUFFIX;
             serviceNameMappings.setProperty(javaClassNameKey, oDataService.getJavaClassName());
             serviceNameMappings.getLayout().setComment(javaClassNameKey, oDataService.getTitle());
-            serviceNameMappings.getLayout().setBlancLinesBefore(javaClassNameKey, 1);
+            serviceNameMappings.getLayout().setBlankLinesBefore(javaClassNameKey, 1);
 
             final String javaPackageNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_PACKAGE_SUFFIX;
             serviceNameMappings.setProperty(javaPackageNameKey, oDataService.getJavaPackageName());
         }
 
         try {
-            serviceNameMappings.save();
+            configurationBuilder.save();
         }
         catch( final ConfigurationException e ) {
             throw new ODataGeneratorWriteException(e);