Skip to content

Commit

Permalink
Reduce casting for operations processing (OpenAPITools#12002)
Browse files Browse the repository at this point in the history
  • Loading branch information
@borsch
borsch authored Apr 6, 2022
1 parent 66db259 commit edfb3e1
Show file tree
Hide file tree
Showing 110 changed files with 836 additions and 644 deletions.
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationsMap;

import java.io.File;
import java.util.List;
Expand Down Expand Up @@ -194,7 +195,7 @@ public interface CodegenConfig {

ModelsMap postProcessModels(ModelsMap objs);

Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels);
OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels);

Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);

Expand Down
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.openapitools.codegen.meta.features.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.serializer.SerializerUtils;
import org.openapitools.codegen.templating.MustacheEngineAdapter;
import org.openapitools.codegen.templating.mustache.*;
Expand Down Expand Up @@ -810,7 +811,7 @@ public void postProcess() {
// override with any special post-processing
@Override
@SuppressWarnings("static-method")
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
return objs;
}

Expand Down
55 changes: 26 additions & 29 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@
import org.openapitools.codegen.languages.PythonExperimentalClientCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.model.ApiInfoMap;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.serializer.SerializerUtils;
import org.openapitools.codegen.templating.CommonTemplateContentLocator;
import org.openapitools.codegen.templating.GeneratorTemplateContentLocator;
Expand Down Expand Up @@ -541,7 +544,7 @@ void generateModels(List<File> files, List<ModelMap> allModels, List<String> unu
}

@SuppressWarnings("unchecked")
void generateApis(List<File> files, List<Object> allOperations, List<ModelMap> allModels) {
void generateApis(List<File> files, List<OperationsMap> allOperations, List<ModelMap> allModels) {
if (!generateApis) {
// TODO: Process these anyway and present info via dryRun?
LOGGER.info("Skipping generation of APIs.");
Expand All @@ -566,7 +569,7 @@ void generateApis(List<File> files, List<Object> allOperations, List<ModelMap> a
try {
List<CodegenOperation> ops = paths.get(tag);
ops.sort((one, another) -> ObjectUtils.compare(one.operationId, another.operationId));
Map<String, Object> operation = processOperations(config, tag, ops, allModels);
OperationsMap operation = processOperations(config, tag, ops, allModels);
URL url = URLPathUtils.getServerURL(openAPI, config.serverVariableOverrides());
operation.put("basePath", basePath);
operation.put("basePathWithoutHost", removeTrailingSlash(config.encodePath(url.getPath())));
Expand Down Expand Up @@ -595,9 +598,8 @@ void generateApis(List<File> files, List<Object> allOperations, List<ModelMap> a
if (config.vendorExtensions().containsKey("x-group-parameters")) {
boolean isGroupParameters = Boolean.parseBoolean(config.vendorExtensions().get("x-group-parameters").toString());

Map<String, Object> objectMap = (Map<String, Object>) operation.get("operations");
@SuppressWarnings("unchecked")
List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
OperationMap objectMap = operation.getOperations();
List<CodegenOperation> operations = objectMap.getOperation();
for (CodegenOperation op : operations) {
if (isGroupParameters && !op.vendorExtensions.containsKey("x-group-parameters")) {
op.vendorExtensions.put("x-group-parameters", Boolean.TRUE);
Expand All @@ -617,7 +619,7 @@ void generateApis(List<File> files, List<Object> allOperations, List<ModelMap> a
processMimeTypes(swagger.getProduces(), operation, "produces");
*/

allOperations.add(new HashMap<>(operation));
allOperations.add(operation);

addAuthenticationSwitches(operation);

Expand Down Expand Up @@ -746,14 +748,13 @@ private void generateSupportingFiles(List<File> files, Map<String, Object> bundl
generateVersionMetadata(files);
}

@SuppressWarnings("unchecked")
Map<String, Object> buildSupportFileBundle(List<Object> allOperations, List<ModelMap> allModels) {
Map<String, Object> buildSupportFileBundle(List<OperationsMap> allOperations, List<ModelMap> allModels) {

Map<String, Object> bundle = new HashMap<>(config.additionalProperties());
bundle.put("apiPackage", config.apiPackage());

Map<String, Object> apis = new HashMap<>();
apis.put("apis", allOperations);
ApiInfoMap apis = new ApiInfoMap();
apis.setApis(allOperations);

URL url = URLPathUtils.getServerURL(openAPI, config.serverVariableOverrides());

Expand Down Expand Up @@ -887,7 +888,7 @@ public List<File> generate() {
List<ModelMap> allModels = new ArrayList<>();
generateModels(files, allModels, filteredSchemas);
// apis
List<Object> allOperations = new ArrayList<>();
List<OperationsMap> allOperations = new ArrayList<>();
generateApis(files, allOperations, allModels);

// supporting files
Expand Down Expand Up @@ -1170,11 +1171,11 @@ private static String generateParameterId(Parameter parameter) {
return parameter.getName() + ":" + parameter.getIn();
}

private Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops, List<ModelMap> allModels) {
Map<String, Object> operations = new HashMap<>();
Map<String, Object> objs = new HashMap<>();
objs.put("classname", config.toApiName(tag));
objs.put("pathPrefix", config.toApiVarName(tag));
private OperationsMap processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops, List<ModelMap> allModels) {
OperationsMap operations = new OperationsMap();
OperationMap objs = new OperationMap();
objs.setClassname(config.toApiName(tag));
objs.setPathPrefix(config.toApiVarName(tag));

// check for operationId uniqueness
Set<String> opIds = new HashSet<>();
Expand All @@ -1187,9 +1188,9 @@ private Map<String, Object> processOperations(CodegenConfig config, String tag,
}
opIds.add(opId);
}
objs.put("operation", ops);
objs.setOperation(ops);

operations.put("operations", objs);
operations.setOperation(objs);
operations.put("package", config.apiPackage());

Set<String> allImports = new ConcurrentSkipListSet<>();
Expand All @@ -1201,10 +1202,10 @@ private Map<String, Object> processOperations(CodegenConfig config, String tag,
Set<Map<String, String>> imports = toImportsObjects(mappings);

//Some codegen implementations rely on a list interface for the imports
operations.put("imports", imports.stream().collect(Collectors.toList()));
operations.setImports(new ArrayList<>(imports));

// add a flag to indicate whether there's any {{import}}
if (imports.size() > 0) {
if (!imports.isEmpty()) {
operations.put("hasImport", true);
}

Expand Down Expand Up @@ -1239,18 +1240,14 @@ private Map<String, String> getAllImportsMappings(Set<String> allImports) {
* @return The set of unique imports
*/
private Set<Map<String, String>> toImportsObjects(Map<String, String> mappedImports) {
Set<Map<String, String>> result = new TreeSet<Map<String, String>>(
(Comparator<Map<String, String>>) (o1, o2) -> {
String s1 = o1.get("classname");
String s2 = o2.get("classname");
return s1.compareTo(s2);
}
Set<Map<String, String>> result = new TreeSet<>(
Comparator.comparing(o -> o.get("classname"))
);

mappedImports.entrySet().forEach(mapping -> {
mappedImports.forEach((key, value) -> {
Map<String, String> im = new LinkedHashMap<>();
im.put("import", mapping.getKey());
im.put("classname", mapping.getValue());
im.put("import", key);
im.put("classname", value);
result.add(im);
});
return result;
Expand Down
8 changes: 5 additions & 3 deletions ...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.openapitools.codegen.meta.features.WireFormatFeature;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -607,9 +609,9 @@ private Map<String, List<String>> getAuthScopes(List<SecurityRequirement> securi

@SuppressWarnings("unchecked")
@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
OperationMap operations = objs.getOperations();
List<CodegenOperation> operationList = operations.getOperation();

for (CodegenOperation op1 : operationList) {
if (op1.summary != null) {
Expand Down
8 changes: 5 additions & 3 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.templating.mustache.*;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -663,12 +665,12 @@ protected void updateNullableTypeProperty(Map<String, ModelsMap> models) {
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
super.postProcessOperationsWithModels(objs, allModels);
if (objs != null) {
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
OperationMap operations = objs.getOperations();
if (operations != null) {
List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
List<CodegenOperation> ops = operations.getOperation();
for (CodegenOperation operation : ops) {

// Check return types for collection
Expand Down
8 changes: 5 additions & 3 deletions ...enapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import org.openapitools.codegen.meta.features.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -560,11 +562,11 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
super.postProcessOperationsWithModels(objs, allModels);
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
OperationMap operations = objs.getOperations();
if (operations != null) {
List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
List<CodegenOperation> ops = operations.getOperation();
for (CodegenOperation op : ops) {
if (op.hasConsumes) {
if (!op.formParams.isEmpty() || op.isMultipart) {
Expand Down
14 changes: 7 additions & 7 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -362,19 +364,17 @@ public String toOperationId(String operationId) {
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
@SuppressWarnings("unchecked")
Map<String, Object> objectMap = (Map<String, Object>) objs.get("operations");
@SuppressWarnings("unchecked")
List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
OperationMap objectMap = objs.getOperations();
List<CodegenOperation> operations = objectMap.getOperation();
for (CodegenOperation operation : operations) {
// http method verb conversion (e.g. PUT => Put)

operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
}

// remove model imports to avoid error
List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
List<Map<String, String>> imports = objs.getImports();
if (imports == null)
return objs;

Expand All @@ -401,7 +401,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
}

// recursively add import for mapping one type to multiple imports
List<Map<String, String>> recursiveImports = (List<Map<String, String>>) objs.get("imports");
List<Map<String, String>> recursiveImports = objs.getImports();
if (recursiveImports == null)
return objs;

Expand Down
8 changes: 5 additions & 3 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.templating.mustache.*;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -512,12 +514,12 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
super.postProcessOperationsWithModels(objs, allModels);
if (objs != null) {
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
OperationMap operations = objs.getOperations();
if (operations != null) {
List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
List<CodegenOperation> ops = operations.getOperation();
for (CodegenOperation operation : ops) {

// Check return types for collection
Expand Down
14 changes: 7 additions & 7 deletions ...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.ModelsMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -462,19 +464,17 @@ public String toOperationId(String operationId) {
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<ModelMap> allModels) {
@SuppressWarnings("unchecked")
Map<String, Object> objectMap = (Map<String, Object>) objs.get("operations");
@SuppressWarnings("unchecked")
List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
OperationMap objectMap = objs.getOperations();
List<CodegenOperation> operations = objectMap.getOperation();

for (CodegenOperation operation : operations) {
// http method verb conversion (e.g. PUT => Put)
operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
}

// remove model imports to avoid error
List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
List<Map<String, String>> imports = objs.getImports();
if (imports == null)
return objs;

Expand Down Expand Up @@ -565,7 +565,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
}

// recursively add import for mapping one type to multiple imports
List<Map<String, String>> recursiveImports = (List<Map<String, String>>) objs.get("imports");
List<Map<String, String>> recursiveImports = objs.getImports();
if (recursiveImports == null)
return objs;

Expand Down
10 changes: 6 additions & 4 deletions ...pi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*;
import org.openapitools.codegen.model.ModelMap;
import org.openapitools.codegen.model.OperationMap;
import org.openapitools.codegen.model.OperationsMap;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -421,10 +423,10 @@ public String toModelImport(String name) {
}

@Override
public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<ModelMap> allModels) {
Map<String, Object> objs = (Map<String, Object>) operations.get("operations");
public OperationsMap postProcessOperationsWithModels(OperationsMap operations, List<ModelMap> allModels) {
OperationMap objs = operations.getOperations();

for (CodegenOperation op : (List<CodegenOperation>) objs.get("operation")) {
for (CodegenOperation op : objs.getOperation()) {
// non GET/HEAD methods are mutation
if (!"GET".equals(op.httpMethod.toUpperCase(Locale.ROOT)) && !"HEAD".equals(op.httpMethod.toUpperCase(Locale.ROOT))) {
op.vendorExtensions.put("x-is-mutation", Boolean.TRUE);
Expand All @@ -440,7 +442,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
}
}

return objs;
return operations;
}

public String graphQlInputsPackage() {
Expand Down
Loading

0 comments on commit edfb3e1

Please sign in to comment.