Skip to content
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

Jump to bottom

refs swagger-api/swagger-codegen#9548 - fix NPE for composed models #415

Merged
merged 1 commit into from
Jul 10, 2019
Merged

refs swagger-api/swagger-codegen#9548 - fix NPE for composed models #415

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
63 changes: 35 additions & 28 deletions src/main/java/io/swagger/codegen/v3/generators/SchemaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -49,38 +50,46 @@ public void configureOneOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
final List<String> modelNames = new ArrayList<>();

for (Schema interfaceSchema : oneOf) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
}
}
oneOfModel.vendorExtensions.put("x-model-names", modelNames);
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
if (codegenModel.interfaceModels == null) {
codegenModel.interfaceModels = new ArrayList<>();
if (!modelNames.isEmpty()) {
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
if (codegenModel.interfaceModels == null) {
codegenModel.interfaceModels = new ArrayList<>();
}
codegenModel.interfaceModels.add(oneOfModel);
}
codegenModel.interfaceModels.add(oneOfModel);
}

public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
String oneOfModelName = "AnyOf" + codegenModel.name;
final CodegenModel oneOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
oneOfModel.name = oneOfModelName;
oneOfModel.classname = codegenConfig.toModelName(oneOfModelName);
oneOfModel.classVarName = codegenConfig.toVarName(oneOfModelName);
oneOfModel.classFilename = codegenConfig.toModelFilename(oneOfModelName);
oneOfModel.vendorExtensions.put("x-is-composed-model", Boolean.TRUE);
public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> anyOf) {
String anyOfModelName = "AnyOf" + codegenModel.name;
final CodegenModel anyOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
anyOfModel.name = anyOfModelName;
anyOfModel.classname = codegenConfig.toModelName(anyOfModelName);
anyOfModel.classVarName = codegenConfig.toVarName(anyOfModelName);
anyOfModel.classFilename = codegenConfig.toModelFilename(anyOfModelName);
anyOfModel.vendorExtensions.put("x-is-composed-model", Boolean.TRUE);

final List<String> modelNames = new ArrayList<>();

for (Schema interfaceSchema : oneOf) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
for (Schema interfaceSchema : anyOf) {
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
}
}
oneOfModel.vendorExtensions.put("x-model-names", modelNames);
codegenModel.vendorExtensions.put("anyOf-model", oneOfModel);
if (codegenModel.interfaceModels == null) {
codegenModel.interfaceModels = new ArrayList<>();
anyOfModel.vendorExtensions.put("x-model-names", modelNames);
if (!modelNames.isEmpty()) {
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
if (codegenModel.interfaceModels == null) {
codegenModel.interfaceModels = new ArrayList<>();
}
codegenModel.interfaceModels.add(anyOfModel);
}
codegenModel.interfaceModels.add(oneOfModel);
}

public void configureOneOfModelFromProperty(CodegenProperty codegenProperty, CodegenModel codegenModel) {
Expand Down Expand Up @@ -119,17 +128,15 @@ public void configureAnyOfModelFromProperty(CodegenProperty codegenProperty, Cod
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
}

public void configureAnyOfModelFromProperty() {

}

private CodegenModel createFromOneOfSchemas(List<Schema> schemas) {
final CodegenModel codegenModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
final List<String> modelNames = new ArrayList<>();

for (Schema interfaceSchema : schemas) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
}
}
codegenModel.vendorExtensions.put("x-model-names", modelNames);
return codegenModel;
Expand Down