Reduce casting for operations processing#12002

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
wing328 merged 2 commits into from
Apr 6, 2022
Merged

Reduce casting for operations processing #12002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f114ca0
Reduce casting for operations processing
borsch Mar 30, 2022
6702e84
Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…
borsch Apr 2, 2022
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
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Reduce casting for operations processing#12002

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

wing328
merged 2 commits into

from

Apr 6, 2022
 Merged


Reduce casting for operations processing
#12002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f114ca0

Reduce casting for operations processing


borsch Mar 30, 2022
6702e84

Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene…


borsch Apr 2, 2022

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


3 changes: 2 additions & 1 deletion
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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