loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-06-01 06:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

skip warning, better code format for jetbrain http client generator (#18299)

Browse Source
This commit is contained in:
William Cheng 2024-04-06 11:01:08 +08:00 committed by GitHub
parent 1024c7733e
commit ac14e66da1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JetbrainsHttpClientClientCodegen.java
View File

@ -109,11 +109,11 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
var additionalProperties = additionalProperties(); var additionalProperties = additionalProperties();
if(additionalProperties.containsKey(BODY_VARIABLES)) { if (additionalProperties.containsKey(BODY_VARIABLES)) {
bodyVariables = Arrays.asList(additionalProperties.get(BODY_VARIABLES).toString().split("-")); bodyVariables = Arrays.asList(additionalProperties.get(BODY_VARIABLES).toString().split("-"));
} }
if(additionalProperties.containsKey(CUSTOM_HEADERS)) { if (additionalProperties.containsKey(CUSTOM_HEADERS)) {
customHeaders = Arrays.asList(additionalProperties.get(CUSTOM_HEADERS).toString().split("&")); customHeaders = Arrays.asList(additionalProperties.get(CUSTOM_HEADERS).toString().split("&"));
} }
} }
@ -138,15 +138,15 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
@Override @Override
public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) { public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
OperationsMap results = super.postProcessOperationsWithModels(objs, allModels); OperationsMap results = super.postProcessOperationsWithModels(objs, allModels);
OperationMap ops = results.getOperations(); OperationMap ops = results.getOperations();
List<CodegenOperation> opList = ops.getOperation(); List<CodegenOperation> opList = ops.getOperation();
for(CodegenOperation codegenOperation : opList) { for (CodegenOperation codegenOperation : opList) {
List<RequestItem> requests = getRequests(codegenOperation); List<RequestItem> requests = getRequests(codegenOperation);
if(requests != null) { if (requests != null) {
codegenOperation.vendorExtensions.put("requests", requests); codegenOperation.vendorExtensions.put("requests", requests);
//Adding to each operation for now, we may be smarter later on //Adding to each operation for now, we may be smarter later on
codegenOperation.vendorExtensions.put("customHeaders", customHeaders); codegenOperation.vendorExtensions.put("customHeaders", customHeaders);
@ -158,7 +158,7 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
List<RequestItem> getRequests(CodegenOperation codegenOperation) { List<RequestItem> getRequests(CodegenOperation codegenOperation) {
List<RequestItem> items = new ArrayList<>(); List<RequestItem> items = new ArrayList<>();
if(codegenOperation.getHasBodyParam()) { if (codegenOperation.getHasBodyParam()) {
// operation with bodyParam // operation with bodyParam
if (requestParameterGeneration.equalsIgnoreCase("Schema")) { if (requestParameterGeneration.equalsIgnoreCase("Schema")) {
// get from schema // get from schema
@ -173,7 +173,7 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
// find in components/examples // find in components/examples
for (Map.Entry<String, Example> entry : codegenOperation.bodyParam.getContent().get("application/json").getExamples().entrySet()) { for (Map.Entry<String, Example> entry : codegenOperation.bodyParam.getContent().get("application/json").getExamples().entrySet()) {
String exampleRef = entry.getValue().get$ref(); String exampleRef = entry.getValue().get$ref();
if(exampleRef != null){ if (exampleRef != null) {
Example example = this.openAPI.getComponents().getExamples().get(extractExampleByName(exampleRef)); Example example = this.openAPI.getComponents().getExamples().get(extractExampleByName(exampleRef));
String exampleAsString = getJsonFromExample(example); String exampleAsString = getJsonFromExample(example);
items.add(new RequestItem(example.getSummary(), exampleAsString)); items.add(new RequestItem(example.getSummary(), exampleAsString));
@ -200,11 +200,11 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
} }
private List<RequestItem> handleCustomVariablesInRequests(List<RequestItem> items) { private List<RequestItem> handleCustomVariablesInRequests(List<RequestItem> items) {
if(!bodyVariables.isEmpty()){ if (!bodyVariables.isEmpty()) {
for(var item : items){ for (var item : items) {
for(var customVariable: bodyVariables){ for (var customVariable : bodyVariables) {
var body = item.getBody(); var body = item.getBody();
if(body != null){ if (body != null) {
body = body.replace(customVariable, "{{" + customVariable + "}}"); body = body.replace(customVariable, "{{" + customVariable + "}}");
item.setBody(body); item.setBody(body);
} }
@ -269,7 +269,7 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + codegenProperty.baseName + JSON_ESCAPE_DOUBLE_QUOTE + ": " + ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + codegenProperty.baseName + JSON_ESCAPE_DOUBLE_QUOTE + ": " +
JSON_ESCAPE_DOUBLE_QUOTE + "<" + getType(codegenProperty) + ">" + JSON_ESCAPE_DOUBLE_QUOTE; JSON_ESCAPE_DOUBLE_QUOTE + "<" + getType(codegenProperty) + ">" + JSON_ESCAPE_DOUBLE_QUOTE;
if(counter < numVars) { if (counter < numVars) {
// add comma unless last attribute // add comma unless last attribute
ret = ret + "," + JSON_ESCAPE_NEW_LINE + " "; ret = ret + "," + JSON_ESCAPE_NEW_LINE + " ";
} }
@ -283,9 +283,9 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
} }
public String getType(CodegenProperty codegenProperty) { public String getType(CodegenProperty codegenProperty) {
if(codegenProperty.isNumeric) { if (codegenProperty.isNumeric) {
return "number"; return "number";
} else if(codegenProperty.isDate) { } else if (codegenProperty.isDate) {
return "date"; return "date";
} else { } else {
return "string"; return "string";
@ -316,14 +316,14 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
public String getJsonFromExample(Example example) { public String getJsonFromExample(Example example) {
String ret = ""; String ret = "";
if(example == null) { if (example == null) {
return ret; return ret;
} }
if(example.getValue() instanceof ObjectNode) { if (example.getValue() instanceof ObjectNode) {
ret = convertToJson((ObjectNode)example.getValue()); ret = convertToJson((ObjectNode) example.getValue());
} else if(example.getValue() instanceof LinkedHashMap) { } else if (example.getValue() instanceof LinkedHashMap) {
ret = convertToJson((LinkedHashMap)example.getValue()); ret = convertToJson((LinkedHashMap) example.getValue());
} }
return ret; return ret;
@ -350,9 +350,9 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
String key = mapElement.getKey(); String key = mapElement.getKey();
Object value = mapElement.getValue(); Object value = mapElement.getValue();
if(value instanceof String) { if (value instanceof String) {
// unescape double quotes already escaped // unescape double quotes already escaped
value = ((String)value).replace("\\\"", "\""); value = ((String) value).replace("\\\"", "\"");
ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": " + ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": " +
JSON_ESCAPE_DOUBLE_QUOTE + value + JSON_ESCAPE_DOUBLE_QUOTE; JSON_ESCAPE_DOUBLE_QUOTE + value + JSON_ESCAPE_DOUBLE_QUOTE;
@ -369,20 +369,21 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
jsonBuilder.append(JSON_ESCAPE_DOUBLE_QUOTE).append(items.get(i)).append(JSON_ESCAPE_DOUBLE_QUOTE); jsonBuilder.append(JSON_ESCAPE_DOUBLE_QUOTE).append(items.get(i)).append(JSON_ESCAPE_DOUBLE_QUOTE);
if (i < items.size() - 1) {jsonBuilder.append(",");} if (i < items.size() - 1) {
jsonBuilder.append(",");
}
} }
jsonBuilder.append("]"); jsonBuilder.append("]");
ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": " + jsonBuilder ; ret = ret + JSON_ESCAPE_DOUBLE_QUOTE + key + JSON_ESCAPE_DOUBLE_QUOTE + ": " + jsonBuilder;
} } else {
else {
LOGGER.warn("Value type unrecognised: " + value.getClass()); LOGGER.warn("Value type unrecognised: " + value.getClass());
//WARNING: here we are undoing what is done in "add comma unless last attribute" //WARNING: here we are undoing what is done in "add comma unless last attribute"
// This is meant to avoid dangling commas if we encounter an unknown type // This is meant to avoid dangling commas if we encounter an unknown type
ret = ret.substring(0, ret.length() - 3); ret = ret.substring(0, ret.length() - 3);
} }
if(counter < numVars ) { if (counter < numVars) {
// add comma unless last attribute // add comma unless last attribute
ret = ret + "," + JSON_ESCAPE_NEW_LINE + " "; ret = ret + "," + JSON_ESCAPE_NEW_LINE + " ";
} }
@ -394,4 +395,13 @@ public class JetbrainsHttpClientClientCodegen extends DefaultCodegen implements
return ret; return ret;
} }
} @Override
public String escapeUnsafeCharacters(String input) {
return input;
}
@Override
public String escapeQuotationMark(String input) {
return input;
}
}