Skip to content

Commit 0853bfa

Browse files
fix: Compile with Java 23 (language level 17)
1 parent ee16766 commit 0853bfa

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@ private record Value( @Nonnull String value, @Nonnull String comment )
4444
* @param file
4545
* the file to read and write mappings from/to
4646
*/
47-
public ServiceNameMappings( @Nonnull final Path file )
47+
private ServiceNameMappings( @Nonnull final Path file )
4848
{
4949
this.file = file;
50+
}
51+
52+
public static ServiceNameMappings load( @Nonnull final Path file )
53+
{
54+
ServiceNameMappings mappings = new ServiceNameMappings(file);
5055
if( Files.exists(file) ) {
51-
populateMappings();
56+
mappings.populateMappings();
5257
}
58+
return mappings;
5359
}
5460

5561
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ private void cleanDirectory( final File outputDir )
293293

294294
private ServiceNameMappings loadPropertiesConfiguration( final File serviceMappingsFile )
295295
{
296-
return new ServiceNameMappings(serviceMappingsFile.toPath());
296+
return ServiceNameMappings.load(serviceMappingsFile.toPath());
297297
}
298298

299299
// Schema definitions are necessary to make the EDMX properties explorable through Olingo API at runtime, example:
@@ -334,7 +334,7 @@ static List<CsdlSchema> loadEdmxSchemas()
334334
private void storeConfiguration( final File serviceMappingsFile, final Iterable<Service> allODataServices )
335335
{
336336
ensureFileExists(serviceMappingsFile);
337-
final ServiceNameMappings mappings = new ServiceNameMappings(serviceMappingsFile.toPath());
337+
final ServiceNameMappings mappings = ServiceNameMappings.load(serviceMappingsFile.toPath());
338338

339339
for( final Service oDataService : allODataServices ) {
340340
final String javaClassNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_CLASS_SUFFIX;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,13 @@ private void cleanDirectory( final File outputDir )
288288

289289
private ServiceNameMappings loadPropertiesConfiguration( final File serviceMappingsFile )
290290
{
291-
return new ServiceNameMappings(serviceMappingsFile.toPath());
291+
return ServiceNameMappings.load(serviceMappingsFile.toPath());
292292
}
293293

294294
private void storeConfiguration( final File serviceMappingsFile, final Iterable<Service> allODataServices )
295295
{
296296
ensureFileExists(serviceMappingsFile);
297-
final ServiceNameMappings mappings = new ServiceNameMappings(serviceMappingsFile.toPath());
297+
final ServiceNameMappings mappings = ServiceNameMappings.load(serviceMappingsFile.toPath());
298298

299299
for( final Service oDataService : allODataServices ) {
300300
final String javaClassNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_CLASS_SUFFIX;

0 commit comments

Comments
 (0)