Skip to content

[OpenAPI Generator] Enable custom operationId -> name mapping #2

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

Open
newtork wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[OpenAPI Generator] Enable custom operationId -> name mapping #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b139580
Initial
newtork Aug 9, 2024
d3c8b02
Merge remote-tracking branch 'origin/main' into openapi/enable-operat…
newtork Aug 13, 2024
26cdb25
Format
newtork Aug 14, 2024
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
21 changes: 20 additions & 1 deletion .../java/com/sap/cloud/sdk/datamodel/openapi/generator/GenerationConfigurationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Year;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -21,6 +22,7 @@
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.OperationsMap;

import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.sap.cloud.sdk.datamodel.openapi.generator.model.ApiMaturity;
import com.sap.cloud.sdk.datamodel.openapi.generator.model.GenerationConfiguration;
Expand Down Expand Up @@ -49,7 +51,7 @@ class GenerationConfigurationConverter
static final String SAP_COPYRIGHT_HEADER =
"Copyright (c) " + Year.now() + " SAP SE or an SAP affiliate company. All rights reserved.";
static final String TEMPLATE_DIRECTORY = Paths.get("openapi-generator").resolve("mustache-templates").toString();
static final String LIBRARY_NAME = JavaClientCodegen.RESTTEMPLATE;
static final String LIBRARY_NAME = "resttemplate";

@Nonnull
static ClientOptInput convertGenerationConfiguration(
Expand All @@ -67,6 +69,9 @@ static ClientOptInput convertGenerationConfiguration(
config.setTemplateDir(TEMPLATE_DIRECTORY);
config.additionalProperties().putAll(getAdditionalProperties(generationConfiguration));

final var operationIdNameMapping = getOperationIdNameMapping(generationConfiguration);
config.operationIdNameMapping().putAll(operationIdNameMapping);

final var clientOptInput = new ClientOptInput();
clientOptInput.config(config);
clientOptInput.openAPI(parseOpenApiSpec(inputSpecFile));
Expand Down Expand Up @@ -96,6 +101,20 @@ public OperationsMap postProcessOperationsWithModels(
};
}

private static Map<String, String> getOperationIdNameMapping( @Nonnull final GenerationConfiguration config )
{
var allowIds = config.getAdditionalProperties().get("operationIdNames");
if( allowIds == null || allowIds.isBlank() ) {
return Collections.emptyMap();
}

// sanitized
allowIds = String.join(",", allowIds.trim().replaceAll(",?\\s+,?", ","));

// split to map, throw exception for duplicate keys or invalid strings
return Splitter.on(",").withKeyValueSeparator("=").split(allowIds);
}

private static void setGlobalSettings()
{
GlobalSettings.setProperty(CodegenConstants.APIS, "");
Expand Down