From 0853bfa0e96453988ffb014ecc28c2c9f805cb1a Mon Sep 17 00:00:00 2001 From: I538344 Date: Tue, 1 Jul 2025 10:03:41 +0200 Subject: [PATCH 1/5] fix: Compile with Java 23 (language level 17) --- .../datamodel/odata/utility/ServiceNameMappings.java | 10 ++++++++-- .../odatav4/generator/ODataToVdmGenerator.java | 4 ++-- .../datamodel/odata/generator/ODataToVdmGenerator.java | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java index 6b1bb783d..6f10654ac 100644 --- a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java +++ b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java @@ -44,12 +44,18 @@ private record Value( @Nonnull String value, @Nonnull String comment ) * @param file * the file to read and write mappings from/to */ - public ServiceNameMappings( @Nonnull final Path file ) + private ServiceNameMappings( @Nonnull final Path file ) { this.file = file; + } + + public static ServiceNameMappings load( @Nonnull final Path file ) + { + ServiceNameMappings mappings = new ServiceNameMappings(file); if( Files.exists(file) ) { - populateMappings(); + mappings.populateMappings(); } + return mappings; } /** diff --git a/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ODataToVdmGenerator.java b/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ODataToVdmGenerator.java index 09c62ea04..d450b381b 100644 --- a/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ODataToVdmGenerator.java +++ b/datamodel/odata-v4/odata-v4-generator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ODataToVdmGenerator.java @@ -293,7 +293,7 @@ private void cleanDirectory( final File outputDir ) private ServiceNameMappings loadPropertiesConfiguration( final File serviceMappingsFile ) { - return new ServiceNameMappings(serviceMappingsFile.toPath()); + return ServiceNameMappings.load(serviceMappingsFile.toPath()); } // Schema definitions are necessary to make the EDMX properties explorable through Olingo API at runtime, example: @@ -334,7 +334,7 @@ static List loadEdmxSchemas() private void storeConfiguration( final File serviceMappingsFile, final Iterable allODataServices ) { ensureFileExists(serviceMappingsFile); - final ServiceNameMappings mappings = new ServiceNameMappings(serviceMappingsFile.toPath()); + final ServiceNameMappings mappings = ServiceNameMappings.load(serviceMappingsFile.toPath()); for( final Service oDataService : allODataServices ) { final String javaClassNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_CLASS_SUFFIX; diff --git a/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java b/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java index 332cf1af3..bac2ac602 100644 --- a/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java +++ b/datamodel/odata/odata-generator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java @@ -288,13 +288,13 @@ private void cleanDirectory( final File outputDir ) private ServiceNameMappings loadPropertiesConfiguration( final File serviceMappingsFile ) { - return new ServiceNameMappings(serviceMappingsFile.toPath()); + return ServiceNameMappings.load(serviceMappingsFile.toPath()); } private void storeConfiguration( final File serviceMappingsFile, final Iterable allODataServices ) { ensureFileExists(serviceMappingsFile); - final ServiceNameMappings mappings = new ServiceNameMappings(serviceMappingsFile.toPath()); + final ServiceNameMappings mappings = ServiceNameMappings.load(serviceMappingsFile.toPath()); for( final Service oDataService : allODataServices ) { final String javaClassNameKey = oDataService.getName() + Service.SERVICE_MAPPINGS_CLASS_SUFFIX; From 8c5a7d87e4cf63afb96eea18c654ae5ad5aba15a Mon Sep 17 00:00:00 2001 From: I538344 Date: Tue, 1 Jul 2025 10:30:12 +0200 Subject: [PATCH 2/5] Javadoc --- .../datamodel/odata/utility/ServiceNameMappings.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java index 6f10654ac..7ee5b72cd 100644 --- a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java +++ b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java @@ -38,17 +38,17 @@ private record Value( @Nonnull String value, @Nonnull String comment ) { } + private ServiceNameMappings( @Nonnull final Path file ) + { + this.file = file; + } + /** * Creates a new instance of {@link ServiceNameMappings} with the specified file. * * @param file * the file to read and write mappings from/to */ - private ServiceNameMappings( @Nonnull final Path file ) - { - this.file = file; - } - public static ServiceNameMappings load( @Nonnull final Path file ) { ServiceNameMappings mappings = new ServiceNameMappings(file); From 0473b0b46c340328d40e284290098bab1f0f2628 Mon Sep 17 00:00:00 2001 From: I538344 Date: Tue, 1 Jul 2025 11:02:28 +0200 Subject: [PATCH 3/5] PMD deprecated rule --- codestyle/pmd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codestyle/pmd.xml b/codestyle/pmd.xml index c9681768c..8960b4d1e 100644 --- a/codestyle/pmd.xml +++ b/codestyle/pmd.xml @@ -27,7 +27,7 @@ 3 - + 3 From 162f471d49d8fc117ee15a7f98a19fc12e8ba9a2 Mon Sep 17 00:00:00 2001 From: I538344 Date: Tue, 1 Jul 2025 11:07:25 +0200 Subject: [PATCH 4/5] PMD --- .../sdk/datamodel/odata/utility/ServiceNameMappings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java index 7ee5b72cd..d2411f495 100644 --- a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java +++ b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java @@ -18,6 +18,7 @@ import com.google.common.base.Joiner; import lombok.extern.slf4j.Slf4j; +import lombok.val; /** * This class is used to read and write service name mappings from a file. @@ -49,9 +50,10 @@ private ServiceNameMappings( @Nonnull final Path file ) * @param file * the file to read and write mappings from/to */ + @Nonnull public static ServiceNameMappings load( @Nonnull final Path file ) { - ServiceNameMappings mappings = new ServiceNameMappings(file); + val mappings = new ServiceNameMappings(file); if( Files.exists(file) ) { mappings.populateMappings(); } From f42781694cf1780f8f6c78f50792a5cf40373b19 Mon Sep 17 00:00:00 2001 From: I538344 Date: Tue, 1 Jul 2025 11:40:01 +0200 Subject: [PATCH 5/5] no lombok? --- .../cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java index d2411f495..507ce7980 100644 --- a/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java +++ b/datamodel/odata-generator-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java @@ -18,7 +18,6 @@ import com.google.common.base.Joiner; import lombok.extern.slf4j.Slf4j; -import lombok.val; /** * This class is used to read and write service name mappings from a file. @@ -53,7 +52,7 @@ private ServiceNameMappings( @Nonnull final Path file ) @Nonnull public static ServiceNameMappings load( @Nonnull final Path file ) { - val mappings = new ServiceNameMappings(file); + final ServiceNameMappings mappings = new ServiceNameMappings(file); if( Files.exists(file) ) { mappings.populateMappings(); }