Skip to content

fix: Compile with Java 23 (language level 17) #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 1, 2025
+15 −8
Merged

fix: Compile with Java 23 (language level 17) #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0853bfa
fix: Compile with Java 23 (language level 17)
CharlesDuboisSAP Jul 1, 2025
8c5a7d8
Javadoc
CharlesDuboisSAP Jul 1, 2025
0473b0b
PMD deprecated rule
CharlesDuboisSAP Jul 1, 2025
162f471
PMD
CharlesDuboisSAP Jul 1, 2025
f427816
no lombok?
CharlesDuboisSAP Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codestyle/pmd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<rule ref="category/java/design.xml/AvoidThrowingRawExceptionTypes">
<priority>3</priority>
</rule>
<rule ref="category/java/errorprone.xml/NonCaseLabelInSwitchStatement">
<rule ref="category/java/errorprone.xml/NonCaseLabelInSwitch">
<priority>3</priority>
</rule>
<rule ref="category/java/bestpractices.xml/PreserveStackTrace">
Expand Down
13 changes: 10 additions & 3 deletions ...-utility/src/main/java/com/sap/cloud/sdk/datamodel/odata/utility/ServiceNameMappings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,25 @@ 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
*/
public ServiceNameMappings( @Nonnull final Path file )
@Nonnull
public static ServiceNameMappings load( @Nonnull final Path file )
{
this.file = file;
final ServiceNameMappings mappings = new ServiceNameMappings(file);
if( Files.exists(file) ) {
populateMappings();
mappings.populateMappings();
}
return mappings;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...ator/src/main/java/com/sap/cloud/sdk/datamodel/odatav4/generator/ODataToVdmGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -334,7 +334,7 @@ static List<CsdlSchema> loadEdmxSchemas()
private void storeConfiguration( final File serviceMappingsFile, final Iterable<Service> 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;
Expand Down
4 changes: 2 additions & 2 deletions ...erator/src/main/java/com/sap/cloud/sdk/datamodel/odata/generator/ODataToVdmGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Service> 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;
Expand Down
Loading