Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ export class JacksonRenderer extends JavaRenderer {
"JsonParser",
"JsonProcessingException",
"ObjectMapper",
"ObjectReader",
"ObjectWriter",
"DeserializationFeature",
"SerializationFeature",
"DeserializationContext",
"SerializerProvider",
"None",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,18 @@ export class KotlinJacksonRenderer extends KotlinRenderer {
"JsonGenerator",
"JsonNode",
"JsonParser",
"ArrayNode",
"BooleanNode",
"DeserializationFeature",
"DoubleNode",
"IntNode",
"LongNode",
"NullNode",
"ObjectNode",
"TextNode",
"ObjectMapper",
"SerializerProvider",
"SerializationFeature",
"SimpleModule",
"StdDeserializer",
"StdSerializer",
Expand Down
40 changes: 26 additions & 14 deletions test/inputs/json/priority/keywords.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"and_eq": { "and_eq": 123 },
"any": { "any": 123 },
"Any": { "Any": 123 },
"ArrayNode": { "ArrayNode": 123 },
"array": { "array": 123 },
"as": { "as": 123 },
"asm": { "asm": 123 },
Expand All @@ -30,6 +31,7 @@
"BOOL": { "BOOL": 123 },
"bool": { "bool": 123 },
"boolean": { "boolean": 123 },
"BooleanNode": { "BooleanNode": 123 },
"break": { "break": 123 },
"bycopy": { "bycopy": 123 },
"byref": { "byref": 123 },
Expand Down Expand Up @@ -62,11 +64,11 @@
"convenience": { "convenience": 123 },
"convert": { "convert": 123 },
"converter": { "converter": 123 },
"CultureInfo": { "CultureInfo": 123 },
"date": { "date": 123 },
"dummy": 123
},
"obj2": {
"CultureInfo": { "CultureInfo": 123 },
"date": { "date": 123 },
"date_parse_handling": { "date_parse_handling": 123 },
"DateFormatter": { "DateFormatter": 123 },
"DateOnly": { "DateOnly": 123 },
Expand All @@ -76,6 +78,7 @@
"debugger": { "debugger": 123 },
"decimal": { "decimal": 123 },
"declare": { "declare": 123 },
"DeserializationFeature": { "DeserializationFeature": 123 },
"decltype": { "decltype": 123 },
"decode_string": { "decode_string": 123 },
"Decoder": { "Decoder": 123 },
Expand All @@ -92,6 +95,7 @@
"didSet": { "didSet": 123 },
"do": { "do": 123 },
"double": { "double": 123 },
"DoubleNode": { "DoubleNode": 123 },
"dynamic": { "dynamic": 123 },
"dynamic_cast": { "dynamic_cast": 123 },
"elif": { "elif": 123 },
Expand Down Expand Up @@ -127,13 +131,13 @@
"from_dict": { "from_dict": 123 },
"from_json": { "from_json": 123 },
"func": { "func": 123 },
"dummy": 123
},
"obj3": {
"function": { "function": 123 },
"get": { "get": 123 },
"global": { "global": 123 },
"go": { "go": 123 },
"dummy": 123
},
"obj3": {
"goto": { "goto": 123 },
"guard": { "guard": 123 },
"Hashable": { "Hashable": 123 },
Expand All @@ -154,6 +158,7 @@
"inout": { "inout": 123 },
"instanceof": { "instanceof": 123 },
"int": { "int": 123 },
"IntNode": { "IntNode": 123 },
"interface": { "interface": 123 },
"internal": { "internal": 123 },
"IsoDateTimeOffsetConverter": { "IsoDateTimeOffsetConverter": 123 },
Expand Down Expand Up @@ -183,6 +188,7 @@
"left": { "left": 123 },
"let": { "let": 123 },
"list": { "list": 123 },
"LongNode": { "LongNode": 123 },
"Locale": { "Locale": 123 },
"lock": { "lock": 123 },
"long": { "long": 123 },
Expand All @@ -192,15 +198,16 @@
"module": { "module": 123 },
"mutable": { "mutable": 123 },
"mutating": { "mutating": 123 },
"dummy": 123
},
"obj4": {
"namespace": { "namespace": 123 },
"native": { "native": 123 },
"new": { "new": 123 },
"newtonsoft": { "newtonsoft": 123 },
"nil": { "nil": 123 },
"NullNode": { "NullNode": 123 },
"NO": { "NO": 123 },
"dummy": 123
},
"obj4": {
"noexcept": { "noexcept": 123 },
"nonatomic": { "nonatomic": 123 },
"none": { "none": 123 },
Expand All @@ -218,7 +225,10 @@
"nullptr": { "nullptr": 123 },
"number": { "number": 123 },
"object": { "object": 123 },
"ObjectNode": { "ObjectNode": 123 },
"ObjectMapper": { "ObjectMapper": 123 },
"ObjectReader": { "ObjectReader": 123 },
"ObjectWriter": { "ObjectWriter": 123 },
"of": { "of": 123 },
"oneway": { "oneway": 123 },
"open": { "open": 123 },
Expand Down Expand Up @@ -255,6 +265,9 @@
"require": { "require": 123 },
"required": { "required": 123 },
"requires": { "requires": 123 },
"dummy": 123
},
"obj5": {
"restrict": { "restrict": 123 },
"retain": { "retain": 123 },
"rethrows": { "rethrows": 123 },
Expand All @@ -265,9 +278,6 @@
"sbyte": { "sbyte": 123 },
"sealed": { "sealed": 123 },
"SEL": { "SEL": 123 },
"dummy": 123
},
"obj5": {
"select": { "select": 123 },
"Self": { "Self": 123 },
"Serializable": { "Serializable": 123 },
Expand All @@ -278,6 +288,7 @@
"KSerializer": { "KSerializer": 123 },
"PrimitiveKind": { "PrimitiveKind": 123 },
"SerialDescriptor": { "SerialDescriptor": 123 },
"SerializationFeature": { "SerializationFeature": 123 },
"SerializerProvider": { "SerializerProvider": 123 },
"set": { "set": 123 },
"short": { "short": 123 },
Expand All @@ -303,6 +314,7 @@
"template": { "template": 123 },
"then": { "then": 123 },
"this": { "this": 123 },
"TextNode": { "TextNode": 123 },
"thread_local": { "thread_local": 123 },
"throw": { "throw": 123 },
"throws": { "throws": 123 },
Expand All @@ -320,6 +332,9 @@
"Type": { "Type": 123 },
"type": { "type": 123 },
"typealias": { "typealias": 123 },
"dummy": 123
},
"obj6": {
"typedef": { "typedef": 123 },
"typeid": { "typeid": 123 },
"typename": { "typename": 123 },
Expand All @@ -332,9 +347,6 @@
"UseSerializers": { "UseSerializers": 123 },
"unowned": { "unowned": 123 },
"unsafe": { "unsafe": 123 },
"dummy": 123
},
"obj6": {
"unsigned": { "unsigned": 123 },
"ushort": { "ushort": 123 },
"using": { "using": 123 },
Expand Down
10 changes: 9 additions & 1 deletion test/inputs/schema/direct-union.1.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"arrayNode": {},
"booleanNode": {},
"doubleNode": {},
"intNode": {},
"longNode": {},
"nullNode": {},
"objectNode": {},
"textNode": {},
"stuff": {
"one": {
"required": null
Expand All @@ -18,4 +26,4 @@
]
}
}
}
}
20 changes: 18 additions & 2 deletions test/inputs/schema/direct-union.schema
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,28 @@
"additionalProperties": {
"$ref": "#/definitions/thing"
}
}
},
"arrayNode": { "$ref": "#/definitions/ArrayNode" },
"booleanNode": { "$ref": "#/definitions/BooleanNode" },
"doubleNode": { "$ref": "#/definitions/DoubleNode" },
"intNode": { "$ref": "#/definitions/IntNode" },
"longNode": { "$ref": "#/definitions/LongNode" },
"nullNode": { "$ref": "#/definitions/NullNode" },
"objectNode": { "$ref": "#/definitions/ObjectNode" },
"textNode": { "$ref": "#/definitions/TextNode" }
},
"required": [
"stuff"
],
"definitions": {
"ArrayNode": { "type": "object", "additionalProperties": false },
"BooleanNode": { "type": "object", "additionalProperties": false },
"DoubleNode": { "type": "object", "additionalProperties": false },
"IntNode": { "type": "object", "additionalProperties": false },
"LongNode": { "type": "object", "additionalProperties": false },
"NullNode": { "type": "object", "additionalProperties": false },
"ObjectNode": { "type": "object", "additionalProperties": false },
"TextNode": { "type": "object", "additionalProperties": false },
"thing": {
"type": "object",
"additionalProperties": false,
Expand Down Expand Up @@ -40,4 +56,4 @@
]
}
}
}
}
12 changes: 12 additions & 0 deletions test/inputs/schema/keyword-enum.schema
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"and_eq",
"any",
"Any",
"ArrayNode",
"array",
"as",
"asm",
Expand All @@ -34,6 +35,7 @@
"BOOL",
"bool",
"boolean",
"BooleanNode",
"break",
"bycopy",
"byref",
Expand Down Expand Up @@ -77,6 +79,7 @@
"debugger",
"decimal",
"declare",
"DeserializationFeature",
"decltype",
"decode_string",
"Decoder",
Expand All @@ -93,6 +96,7 @@
"didSet",
"do",
"double",
"DoubleNode",
"dynamic",
"dynamic_cast",
"elif",
Expand Down Expand Up @@ -152,6 +156,7 @@
"inout",
"instanceof",
"int",
"IntNode",
"interface",
"internal",
"IsoDateTimeOffsetConverter",
Expand Down Expand Up @@ -181,6 +186,7 @@
"left",
"let",
"list",
"LongNode",
"Locale",
"lock",
"long",
Expand All @@ -195,6 +201,7 @@
"new",
"newtonsoft",
"nil",
"NullNode",
"NO",
"noexcept",
"nonatomic",
Expand All @@ -213,7 +220,10 @@
"nullptr",
"number",
"object",
"ObjectNode",
"ObjectMapper",
"ObjectReader",
"ObjectWriter",
"of",
"oneway",
"open",
Expand Down Expand Up @@ -270,6 +280,7 @@
"KSerializer",
"PrimitiveKind",
"SerialDescriptor",
"SerializationFeature",
"SerializerProvider",
"set",
"short",
Expand All @@ -295,6 +306,7 @@
"template",
"then",
"this",
"TextNode",
"thread_local",
"throw",
"throws",
Expand Down
Loading
Loading