Skip to content

[wsdl] string comparison bug fix, minor format change #10446

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 1 commit into from
Sep 22, 2021
Merged

[wsdl] string comparison bug fix, minor format change #10446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 5 additions & 9 deletions ...openapi-generator/src/main/java/org/openapitools/codegen/languages/WsdlSchemaCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@

import java.io.File;
import java.text.Normalizer;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Arrays;
import java.util.*;

public class WsdlSchemaCodegen extends DefaultCodegen implements CodegenConfig {
public static final String PROJECT_NAME = "projectName";
Expand Down Expand Up @@ -138,7 +134,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
for (CodegenResponse response : op.responses) {
if (response.isModel) {
response.dataType = response.dataType.substring(0, 1).toUpperCase(Locale.getDefault())
+ response.dataType.substring(1);
+ response.dataType.substring(1);
}

if (response.isArray) {
Expand Down Expand Up @@ -187,7 +183,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
Map<String, Object> mod = (Map<String, Object>) mo;
CodegenModel model = (CodegenModel) mod.get("model");
Map<String, Object> modelVendorExtensions = model.getVendorExtensions();

for (CodegenProperty var : model.vars) {
Map<String, Object> propertyVendorExtensions = var.getVendorExtensions();

Expand Down Expand Up @@ -218,7 +214,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
}

// specify appearing schema names in case of openapi array with oneOf elements
if (var.openApiType == "array" && var.items.dataType.startsWith("oneOf<")) {
if ("array".equals(var.openApiType) && var.items.dataType.startsWith("oneOf<")) {
// get only comma separated names of schemas from oneOf<name1,name2...>
String schemaNamesString =
var.items.dataType.substring(6, var.items.dataType.length() - 1);
Expand Down Expand Up @@ -248,7 +244,7 @@ public String generateOperationId(CodegenOperation op) {
}
if (pathElements[i].length() > 0) {
newOperationid = newOperationid
+ this.lowerCaseStringExceptFirstLetter(pathElements[i]);
+ this.lowerCaseStringExceptFirstLetter(pathElements[i]);
}
}

Expand Down