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.

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

One of property creation missed #590

Merged
merged 11 commits into from
Jan 29, 2020
Prev Previous commit
Next Next commit
updated html and typescript schema handler classes.
  • Loading branch information
HugoMario committed Jan 29, 2020
commit eacd054f658530660763918fbc87920e611833bc
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@
import io.swagger.codegen.v3.CodegenModelType;
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
import io.swagger.codegen.v3.generators.SchemaHandler;
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 java.util.Map;

public class HtmlSchemaHandler extends SchemaHandler {

public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
super(codegenConfig);
}

protected CodegenModel createComposedModel(String name) {
final CodegenModel composedModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
this.configureModel(composedModel, name);
return composedModel;
@Override
public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
// no ops for html generator
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
package io.swagger.codegen.v3.generators.typescript;

import io.swagger.codegen.v3.CodegenConstants;
import io.swagger.codegen.v3.CodegenModel;
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
import io.swagger.codegen.v3.generators.SchemaHandler;
import io.swagger.v3.oas.models.media.ComposedSchema;
import io.swagger.v3.oas.models.media.Schema;

import java.util.Map;

public class TypeScriptSchemaHandler extends SchemaHandler {

Expand All @@ -11,4 +17,18 @@ public TypeScriptSchemaHandler(DefaultCodegenConfig codegenConfig) {
super(codegenConfig);
this.codegenConfig = (AbstractTypeScriptClientCodegen) codegenConfig;
}

public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
if (!(schema instanceof ComposedSchema)) {
return;
}
final ComposedSchema composedSchema = (ComposedSchema) schema;
final boolean isAlias = composedSchema.getOneOf() != null && !composedSchema.getOneOf().isEmpty()
|| composedSchema.getAnyOf() != null && !composedSchema.getAnyOf().isEmpty();

if (isAlias) {
codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
}
}
}