Skip to content

Commit eacd054

Browse files
committed
updated html and typescript schema handler classes.
1 parent 2dac5d1 commit eacd054

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

src/main/java/io/swagger/codegen/v3/generators/html/HtmlSchemaHandler.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
import io.swagger.codegen.v3.CodegenModelType;
66
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
77
import io.swagger.codegen.v3.generators.SchemaHandler;
8+
import io.swagger.v3.oas.models.media.ArraySchema;
9+
import io.swagger.v3.oas.models.media.ComposedSchema;
10+
import io.swagger.v3.oas.models.media.Schema;
11+
12+
import java.util.Map;
813

914
public class HtmlSchemaHandler extends SchemaHandler {
1015

1116
public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
1217
super(codegenConfig);
1318
}
1419

15-
protected CodegenModel createComposedModel(String name) {
16-
final CodegenModel composedModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
17-
this.configureModel(composedModel, name);
18-
return composedModel;
20+
@Override
21+
public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
22+
// no ops for html generator
1923
}
2024
}

src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptSchemaHandler.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package io.swagger.codegen.v3.generators.typescript;
22

3+
import io.swagger.codegen.v3.CodegenConstants;
4+
import io.swagger.codegen.v3.CodegenModel;
35
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
46
import io.swagger.codegen.v3.generators.SchemaHandler;
7+
import io.swagger.v3.oas.models.media.ComposedSchema;
8+
import io.swagger.v3.oas.models.media.Schema;
9+
10+
import java.util.Map;
511

612
public class TypeScriptSchemaHandler extends SchemaHandler {
713

@@ -11,4 +17,18 @@ public TypeScriptSchemaHandler(DefaultCodegenConfig codegenConfig) {
1117
super(codegenConfig);
1218
this.codegenConfig = (AbstractTypeScriptClientCodegen) codegenConfig;
1319
}
20+
21+
public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map<String, CodegenModel> allModels) {
22+
if (!(schema instanceof ComposedSchema)) {
23+
return;
24+
}
25+
final ComposedSchema composedSchema = (ComposedSchema) schema;
26+
final boolean isAlias = composedSchema.getOneOf() != null && !composedSchema.getOneOf().isEmpty()
27+
|| composedSchema.getAnyOf() != null && !composedSchema.getAnyOf().isEmpty();
28+
29+
if (isAlias) {
30+
codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
31+
this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
32+
}
33+
}
1434
}

0 commit comments

Comments
 (0)