Skip to content

Commit 05a70d4

Browse files
jackson polymorphic type information property not optional
1 parent c6af1fa commit 05a70d4

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson1Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
3939

4040
final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
4141
if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
42-
properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, true, null, null));
42+
properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
4343
}
4444

4545
final BeanHelper beanHelper = getBeanHelper(sourceClass.type);

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
2626

2727
final JsonTypeInfo jsonTypeInfo = sourceClass.type.getAnnotation(JsonTypeInfo.class);
2828
if (jsonTypeInfo != null && jsonTypeInfo.include() == JsonTypeInfo.As.PROPERTY) {
29-
properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, true, null, null));
29+
properties.add(new PropertyModel(jsonTypeInfo.property(), String.class, false, null, null));
3030
}
3131

3232
final BeanHelper beanHelper = getBeanHelper(sourceClass.type);

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/GenericsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void testImplements() {
105105
"}" + nl +
106106
"" + nl +
107107
"export interface IB<T> {" + nl +
108-
" type?: string;" + nl +
108+
" type: string;" + nl +
109109
" x: T;" + nl +
110110
"}";
111111
assertEquals(expected, actual);

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/TypeGuardsForJackson2PolymorphismExtensionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testInTypeScriptGenerator() {
4040
settings.addTypeNamePrefix = "Json";
4141
settings.extensions.add(new TypeGuardsForJackson2PolymorphismExtension());
4242
final String actual = new TypeScriptGenerator(settings).generateTypeScript(Input.from(Point.class));
43-
Assert.assertTrue(actual.contains("type?: string;"));
43+
Assert.assertTrue(actual.contains("type: string;"));
4444
Assert.assertTrue(actual.contains("function isJsonCartesianPoint(jsonPoint: JsonPoint): jsonPoint is JsonCartesianPoint {"));
4545
}
4646

0 commit comments

Comments
 (0)