Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 5e45031

Browse files
spacetherspacether
committed
Adds newlines to new optional properties
1 parent 9a74373 commit 5e45031

File tree

69 files changed

+1265
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1265
-177
lines changed

‎modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_new.hbs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,19 @@ def __new__(
110110
{{#each optionalProperties}}
111111
{{#if @key.isValid}}
112112
{{#if refInfo.refClass}}
113-
{{@key.original}}: typing.Union['{{> components/schemas/_helper_refclass_with_module }}', {{#with getDeepestRef}}{{> _helper_schema_python_types }}{{/with}}, schemas.Unset] = schemas.unset,
113+
{{@key.original}}: typing.Union[
114+
{{> components/schemas/_helper_refclass_with_module }},
115+
schemas.Unset,
116+
{{#with getDeepestRef}}
117+
{{> _helper_schema_python_types_newline }}
118+
{{/with}}
119+
] = schemas.unset,
114120
{{else}}
115-
{{@key.original}}: typing.Union[Schema_.Properties.{{jsonPathPiece.camelCase}}, {{> _helper_schema_python_types }}, schemas.Unset] = schemas.unset,
121+
{{@key.original}}: typing.Union[
122+
Schema_.Properties.{{jsonPathPiece.camelCase}},
123+
schemas.Unset,
124+
{{> _helper_schema_python_types_newline }}
125+
] = schemas.unset,
116126
{{/if}}
117127
{{/if}}
118128
{{/each}}

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/_200_response.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ def __getitem__(
6767
def __new__(
6868
cls,
6969
*args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader],
70-
name: typing.Union[Schema_.Properties.Name, decimal.Decimal, int, schemas.Unset] = schemas.unset,
70+
name: typing.Union[
71+
Schema_.Properties.Name,
72+
schemas.Unset,
73+
decimal.Decimal,
74+
int
75+
] = schemas.unset,
7176
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
7277
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
7378
) -> _200Response[

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/additional_properties_class.py‎

Lines changed: 62 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,68 @@ def __getitem__(
298298
def __new__(
299299
cls,
300300
*args_: typing.Union[dict, frozendict.frozendict],
301-
map_property: typing.Union[Schema_.Properties.MapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
302-
map_of_map_property: typing.Union[Schema_.Properties.MapOfMapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
303-
anytype_1: typing.Union[Schema_.Properties.Anytype1, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
304-
map_with_undeclared_properties_anytype_1: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype1, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
305-
map_with_undeclared_properties_anytype_2: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype2, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
306-
map_with_undeclared_properties_anytype_3: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype3, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
307-
empty_map: typing.Union[Schema_.Properties.EmptyMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
308-
map_with_undeclared_properties_string: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
301+
map_property: typing.Union[
302+
Schema_.Properties.MapProperty,
303+
schemas.Unset,
304+
dict,
305+
frozendict.frozendict
306+
] = schemas.unset,
307+
map_of_map_property: typing.Union[
308+
Schema_.Properties.MapOfMapProperty,
309+
schemas.Unset,
310+
dict,
311+
frozendict.frozendict
312+
] = schemas.unset,
313+
anytype_1: typing.Union[
314+
Schema_.Properties.Anytype1,
315+
schemas.Unset,
316+
dict,
317+
frozendict.frozendict,
318+
str,
319+
datetime.date,
320+
datetime.datetime,
321+
uuid.UUID,
322+
int,
323+
float,
324+
decimal.Decimal,
325+
bool,
326+
None,
327+
list,
328+
tuple,
329+
bytes,
330+
io.FileIO,
331+
io.BufferedReader
332+
] = schemas.unset,
333+
map_with_undeclared_properties_anytype_1: typing.Union[
334+
Schema_.Properties.MapWithUndeclaredPropertiesAnytype1,
335+
schemas.Unset,
336+
dict,
337+
frozendict.frozendict
338+
] = schemas.unset,
339+
map_with_undeclared_properties_anytype_2: typing.Union[
340+
Schema_.Properties.MapWithUndeclaredPropertiesAnytype2,
341+
schemas.Unset,
342+
dict,
343+
frozendict.frozendict
344+
] = schemas.unset,
345+
map_with_undeclared_properties_anytype_3: typing.Union[
346+
Schema_.Properties.MapWithUndeclaredPropertiesAnytype3,
347+
schemas.Unset,
348+
dict,
349+
frozendict.frozendict
350+
] = schemas.unset,
351+
empty_map: typing.Union[
352+
Schema_.Properties.EmptyMap,
353+
schemas.Unset,
354+
dict,
355+
frozendict.frozendict
356+
] = schemas.unset,
357+
map_with_undeclared_properties_string: typing.Union[
358+
Schema_.Properties.MapWithUndeclaredPropertiesString,
359+
schemas.Unset,
360+
dict,
361+
frozendict.frozendict
362+
] = schemas.unset,
309363
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
310364
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
311365
) -> AdditionalPropertiesClass[frozendict.frozendict]:

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/animal.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ def __new__(
9595
Schema_.Properties.ClassName,
9696
str
9797
],
98-
color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
98+
color: typing.Union[
99+
Schema_.Properties.Color,
100+
schemas.Unset,
101+
str
102+
] = schemas.unset,
99103
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
100104
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
101105
) -> Animal[frozendict.frozendict]:

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/any_type_and_format.py‎

Lines changed: 140 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -641,13 +641,146 @@ def __getitem__(
641641
def __new__(
642642
cls,
643643
*args_: typing.Union[dict, frozendict.frozendict],
644-
uuid: typing.Union[Schema_.Properties.Uuid, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
645-
date: typing.Union[Schema_.Properties.Date, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
646-
number: typing.Union[Schema_.Properties.Number, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
647-
binary: typing.Union[Schema_.Properties.Binary, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
648-
int32: typing.Union[Schema_.Properties.Int32, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
649-
int64: typing.Union[Schema_.Properties.Int64, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
650-
double: typing.Union[Schema_.Properties.Double, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
644+
uuid: typing.Union[
645+
Schema_.Properties.Uuid,
646+
schemas.Unset,
647+
dict,
648+
frozendict.frozendict,
649+
str,
650+
datetime.date,
651+
datetime.datetime,
652+
uuid.UUID,
653+
int,
654+
float,
655+
decimal.Decimal,
656+
bool,
657+
None,
658+
list,
659+
tuple,
660+
bytes,
661+
io.FileIO,
662+
io.BufferedReader
663+
] = schemas.unset,
664+
date: typing.Union[
665+
Schema_.Properties.Date,
666+
schemas.Unset,
667+
dict,
668+
frozendict.frozendict,
669+
str,
670+
datetime.date,
671+
datetime.datetime,
672+
uuid.UUID,
673+
int,
674+
float,
675+
decimal.Decimal,
676+
bool,
677+
None,
678+
list,
679+
tuple,
680+
bytes,
681+
io.FileIO,
682+
io.BufferedReader
683+
] = schemas.unset,
684+
number: typing.Union[
685+
Schema_.Properties.Number,
686+
schemas.Unset,
687+
dict,
688+
frozendict.frozendict,
689+
str,
690+
datetime.date,
691+
datetime.datetime,
692+
uuid.UUID,
693+
int,
694+
float,
695+
decimal.Decimal,
696+
bool,
697+
None,
698+
list,
699+
tuple,
700+
bytes,
701+
io.FileIO,
702+
io.BufferedReader
703+
] = schemas.unset,
704+
binary: typing.Union[
705+
Schema_.Properties.Binary,
706+
schemas.Unset,
707+
dict,
708+
frozendict.frozendict,
709+
str,
710+
datetime.date,
711+
datetime.datetime,
712+
uuid.UUID,
713+
int,
714+
float,
715+
decimal.Decimal,
716+
bool,
717+
None,
718+
list,
719+
tuple,
720+
bytes,
721+
io.FileIO,
722+
io.BufferedReader
723+
] = schemas.unset,
724+
int32: typing.Union[
725+
Schema_.Properties.Int32,
726+
schemas.Unset,
727+
dict,
728+
frozendict.frozendict,
729+
str,
730+
datetime.date,
731+
datetime.datetime,
732+
uuid.UUID,
733+
int,
734+
float,
735+
decimal.Decimal,
736+
bool,
737+
None,
738+
list,
739+
tuple,
740+
bytes,
741+
io.FileIO,
742+
io.BufferedReader
743+
] = schemas.unset,
744+
int64: typing.Union[
745+
Schema_.Properties.Int64,
746+
schemas.Unset,
747+
dict,
748+
frozendict.frozendict,
749+
str,
750+
datetime.date,
751+
datetime.datetime,
752+
uuid.UUID,
753+
int,
754+
float,
755+
decimal.Decimal,
756+
bool,
757+
None,
758+
list,
759+
tuple,
760+
bytes,
761+
io.FileIO,
762+
io.BufferedReader
763+
] = schemas.unset,
764+
double: typing.Union[
765+
Schema_.Properties.Double,
766+
schemas.Unset,
767+
dict,
768+
frozendict.frozendict,
769+
str,
770+
datetime.date,
771+
datetime.datetime,
772+
uuid.UUID,
773+
int,
774+
float,
775+
decimal.Decimal,
776+
bool,
777+
None,
778+
list,
779+
tuple,
780+
bytes,
781+
io.FileIO,
782+
io.BufferedReader
783+
] = schemas.unset,
651784
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
652785
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
653786
) -> AnyTypeAndFormat[frozendict.frozendict]:

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/api_response.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,22 @@ def __getitem__(
7070
def __new__(
7171
cls,
7272
*args_: typing.Union[dict, frozendict.frozendict],
73-
code: typing.Union[Schema_.Properties.Code, decimal.Decimal, int, schemas.Unset] = schemas.unset,
74-
type: typing.Union[Schema_.Properties.Type, str, schemas.Unset] = schemas.unset,
75-
message: typing.Union[Schema_.Properties.Message, str, schemas.Unset] = schemas.unset,
73+
code: typing.Union[
74+
Schema_.Properties.Code,
75+
schemas.Unset,
76+
decimal.Decimal,
77+
int
78+
] = schemas.unset,
79+
type: typing.Union[
80+
Schema_.Properties.Type,
81+
schemas.Unset,
82+
str
83+
] = schemas.unset,
84+
message: typing.Union[
85+
Schema_.Properties.Message,
86+
schemas.Unset,
87+
str
88+
] = schemas.unset,
7689
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
7790
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
7891
) -> ApiResponse[frozendict.frozendict]:

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/apple.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ def __getitem__(
105105
def __new__(
106106
cls,
107107
*args_: typing.Union[None, dict, frozendict.frozendict],
108-
origin: typing.Union[Schema_.Properties.Origin, str, schemas.Unset] = schemas.unset,
108+
origin: typing.Union[
109+
Schema_.Properties.Origin,
110+
schemas.Unset,
111+
str
112+
] = schemas.unset,
109113
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
110114
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
111115
) -> Apple[

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/apple_req.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ def __new__(
6363
Schema_.Properties.Cultivar,
6464
str
6565
],
66-
mealy: typing.Union[Schema_.Properties.Mealy, bool, schemas.Unset] = schemas.unset,
66+
mealy: typing.Union[
67+
Schema_.Properties.Mealy,
68+
schemas.Unset,
69+
bool
70+
] = schemas.unset,
6771
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
6872
) -> AppleReq[frozendict.frozendict]:
6973
inst = super().__new__(

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_array_of_number_only.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,12 @@ def __getitem__(
146146
def __new__(
147147
cls,
148148
*args_: typing.Union[dict, frozendict.frozendict],
149-
ArrayArrayNumber: typing.Union[Schema_.Properties.ArrayArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
149+
ArrayArrayNumber: typing.Union[
150+
Schema_.Properties.ArrayArrayNumber,
151+
schemas.Unset,
152+
list,
153+
tuple
154+
] = schemas.unset,
150155
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
151156
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
152157
) -> ArrayOfArrayOfNumberOnly[frozendict.frozendict]:

‎samples/openapi3/client/petstore/python/src/petstore_api/components/schema/array_of_number_only.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,12 @@ def __getitem__(
103103
def __new__(
104104
cls,
105105
*args_: typing.Union[dict, frozendict.frozendict],
106-
ArrayNumber: typing.Union[Schema_.Properties.ArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
106+
ArrayNumber: typing.Union[
107+
Schema_.Properties.ArrayNumber,
108+
schemas.Unset,
109+
list,
110+
tuple
111+
] = schemas.unset,
107112
configuration_: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None,
108113
**kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
109114
) -> ArrayOfNumberOnly[frozendict.frozendict]:

0 commit comments

Comments
 (0)