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

fixed composed schema in arrays #601

Merged
merged 1 commit into from
Feb 14, 2020
Merged

fixed composed schema in arrays #601

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 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 @@ -58,7 +58,7 @@ public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map
processComposedSchema(codegenName, codegenProperty, (ComposedSchema) property, allModels);
continue;
}
if (schema instanceof ArraySchema) {
if (property instanceof ArraySchema) {
this.processArrayItemSchema(codegenName, codegenProperty, (ArraySchema) property, allModels);
continue;
}
Expand Down Expand Up @@ -132,7 +132,7 @@ protected CodegenModel createComposedModel(String name, List<Schema> schemas) {
return composedModel;
}

private void addInterfaceModel(CodegenModel codegenModel, CodegenModel interfaceModel) {
protected void addInterfaceModel(CodegenModel codegenModel, CodegenModel interfaceModel) {
if (codegenModel == null) {
return;
}
Expand All @@ -142,7 +142,7 @@ private void addInterfaceModel(CodegenModel codegenModel, CodegenModel interface
codegenModel.getInterfaceModels().add(interfaceModel);
}

private void addInterfaces(List<Schema> schemas, CodegenModel codegenModel, Map<String, CodegenModel> allModels) {
protected void addInterfaces(List<Schema> schemas, CodegenModel codegenModel, Map<String, CodegenModel> allModels) {
for (Schema interfaceSchema : schemas) {
final String ref = interfaceSchema.get$ref();
if (StringUtils.isBlank(ref)) {
Expand Down
52 changes: 49 additions & 3 deletions src/main/java/io/swagger/codegen/v3/generators/html/HtmlSchemaHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@
import io.swagger.codegen.v3.CodegenModel;
import io.swagger.codegen.v3.CodegenModelFactory;
import io.swagger.codegen.v3.CodegenModelType;
import io.swagger.codegen.v3.CodegenProperty;
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
import io.swagger.codegen.v3.generators.SchemaHandler;
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
import io.swagger.v3.oas.models.media.ArraySchema;
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;
import java.util.Map;

public class HtmlSchemaHandler extends SchemaHandler {
Expand All @@ -17,8 +22,49 @@ public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
super(codegenConfig);
}

@Override
public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
// no ops for html generator
protected void processComposedSchema(CodegenModel codegenModel, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
List<Schema> schemas = composedSchema.getOneOf();
CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModel.getName(), schemas);
if (composedModel == null) {
schemas = composedSchema.getAnyOf();
composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModel.getName(), schemas);
if (composedModel == null) {
return;
}
}
this.addInterfaceModel(codegenModel, composedModel);
this.addInterfaces(schemas, composedModel, allModels);

if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
codegenModel.vendorExtensions.put("oneOf-model", composedModel);
} else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
codegenModel.vendorExtensions.put("anyOf-model", composedModel);
}
}

protected void processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
List<Schema> schemas = composedSchema.getOneOf();
CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModelName, schemas);
if (composedModel == null) {
schemas = composedSchema.getAnyOf();
composedModel = this.createComposedModel(ANY_OF_PREFFIX + codegenModelName, schemas);
if (composedModel == null) {
return;
}
}
if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
codegenProperty.vendorExtensions.put("oneOf-model", composedModel);

} else if (composedModel.getName().startsWith(ONE_OF_PREFFIX)) {
codegenProperty.vendorExtensions.put("anyOf-model", composedModel);
}
final List<String> modelNames = new ArrayList<>();
for (Schema interfaceSchema : schemas) {
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
modelNames.add(codegenConfig.toModelName(schemaName));
}
}
composedModel.vendorExtensions.put("x-model-names", modelNames);
}
}