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

Commit 1d437df

Browse files
spacetherspacether
committed
Removes extra input type from object creation
1 parent 03e90e0 commit 1d437df

File tree

124 files changed

+204
-702
lines changed

Some content is hidden

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

124 files changed

+204
-702
lines changed

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,15 @@ def validate(
3434
{{/each}}
3535
{{else}}
3636
cls,
37-
arg: typing.Union[
3837
{{#each types}}
3938
{{#eq this "object"}}
40-
{{mapInputJsonPathPiece.camelCase}},
41-
{{jsonPathPiece.camelCase}}[frozendict.frozendict],
39+
arg: {{mapInputJsonPathPiece.camelCase}},
4240
{{else}}
41+
arg: typing.Union[
4342
{{> _helper_schema_python_type_newline }}
43+
],
4444
{{/eq}}
4545
{{/each}}
46-
],
4746
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
4847
{{/eq}}
4948
{{else}}

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ arg: typing.Sequence[schemas.INPUT_TYPES_ALL_INCL_SCHEMA],
1919
{{/if}}
2020
{{else}}
2121
{{#eq this "object"}}
22-
arg: typing.Union[
23-
{{mapInputJsonPathPiece.camelCase}},
24-
{{jsonPathPiece.camelCase}}[frozendict.frozendict],
25-
],
22+
arg: {{mapInputJsonPathPiece.camelCase}},
2623
{{else}}
2724
{{#eq this "string"}}
2825
arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID],

‎samples/openapi3/client/petstore/python/src/petstore_api/components/responses/response_success_inline_content_and_header/content/application_json/schema.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ def __getitem__(self, name: str) -> AdditionalProperties[decimal.Decimal]:
3838
@classmethod
3939
def validate(
4040
cls,
41-
arg: typing.Union[
42-
SchemaDict,
43-
Schema[frozendict.frozendict],
44-
],
41+
arg: SchemaDict,
4542
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
4643
) -> SchemaDict:
4744
return super().validate(

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,7 @@ def validate(
136136
@classmethod
137137
def validate(
138138
cls,
139-
arg: typing.Union[
140-
_200ResponseDictInput,
141-
_200Response[frozendict.frozendict],
142-
],
139+
arg: _200ResponseDictInput,
143140
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
144141
) -> _200Response[frozendict.frozendict]: ...
145142

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@ def validate(
123123
@classmethod
124124
def validate(
125125
cls,
126-
arg: typing.Union[
127-
ReturnDictInput,
128-
_Return[frozendict.frozendict],
129-
],
126+
arg: ReturnDictInput,
130127
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
131128
) -> _Return[frozendict.frozendict]: ...
132129

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,7 @@ def __getitem__(
286286
@classmethod
287287
def validate(
288288
cls,
289-
arg: typing.Union[
290-
AbstractStepMessageDictInput,
291-
AbstractStepMessage[frozendict.frozendict],
292-
],
289+
arg: AbstractStepMessageDictInput,
293290
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
294291
) -> AbstractStepMessageDict:
295292
return super().validate(

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

+7-28
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ def __getitem__(self, name: str) -> AdditionalProperties[str]:
3737
@classmethod
3838
def validate(
3939
cls,
40-
arg: typing.Union[
41-
MapPropertyDict,
42-
MapProperty[frozendict.frozendict],
43-
],
40+
arg: MapPropertyDict,
4441
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
4542
) -> MapPropertyDict:
4643
return super().validate(
@@ -75,10 +72,7 @@ def __getitem__(self, name: str) -> AdditionalProperties3[str]:
7572
@classmethod
7673
def validate(
7774
cls,
78-
arg: typing.Union[
79-
AdditionalPropertiesDict,
80-
AdditionalProperties2[frozendict.frozendict],
81-
],
75+
arg: AdditionalPropertiesDict,
8276
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
8377
) -> AdditionalPropertiesDict:
8478
return super().validate(
@@ -113,10 +107,7 @@ def __getitem__(self, name: str) -> AdditionalProperties2[frozendict.frozendict]
113107
@classmethod
114108
def validate(
115109
cls,
116-
arg: typing.Union[
117-
MapOfMapPropertyDict,
118-
MapOfMapProperty[frozendict.frozendict],
119-
],
110+
arg: MapOfMapPropertyDict,
120111
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
121112
) -> MapOfMapPropertyDict:
122113
return super().validate(
@@ -184,10 +175,7 @@ def __getitem__(self, name: str) -> AdditionalProperties4[typing.Union[
184175
@classmethod
185176
def validate(
186177
cls,
187-
arg: typing.Union[
188-
MapWithUndeclaredPropertiesAnytype3Dict,
189-
MapWithUndeclaredPropertiesAnytype3[frozendict.frozendict],
190-
],
178+
arg: MapWithUndeclaredPropertiesAnytype3Dict,
191179
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
192180
) -> MapWithUndeclaredPropertiesAnytype3Dict:
193181
return super().validate(
@@ -212,10 +200,7 @@ class Schema_(metaclass=schemas.SingletonMeta):
212200
@classmethod
213201
def validate(
214202
cls,
215-
arg: typing.Union[
216-
EmptyMapDict,
217-
EmptyMap[frozendict.frozendict],
218-
],
203+
arg: EmptyMapDict,
219204
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
220205
) -> EmptyMapDict:
221206
return super().validate(
@@ -250,10 +235,7 @@ def __getitem__(self, name: str) -> AdditionalProperties6[str]:
250235
@classmethod
251236
def validate(
252237
cls,
253-
arg: typing.Union[
254-
MapWithUndeclaredPropertiesStringDict,
255-
MapWithUndeclaredPropertiesString[frozendict.frozendict],
256-
],
238+
arg: MapWithUndeclaredPropertiesStringDict,
257239
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
258240
) -> MapWithUndeclaredPropertiesStringDict:
259241
return super().validate(
@@ -454,10 +436,7 @@ def __getitem__(
454436
@classmethod
455437
def validate(
456438
cls,
457-
arg: typing.Union[
458-
AdditionalPropertiesClassDictInput,
459-
AdditionalPropertiesClass[frozendict.frozendict],
460-
],
439+
arg: AdditionalPropertiesClassDictInput,
461440
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
462441
) -> AdditionalPropertiesClassDict:
463442
return super().validate(

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

+6-24
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ def __getitem__(self, name: str) -> AdditionalProperties[typing.Union[
6464
@classmethod
6565
def validate(
6666
cls,
67-
arg: typing.Union[
68-
_0Dict,
69-
_0[frozendict.frozendict],
70-
],
67+
arg: _0Dict,
7168
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
7269
) -> _0Dict:
7370
return super().validate(
@@ -133,10 +130,7 @@ def validate(
133130
@classmethod
134131
def validate(
135132
cls,
136-
arg: typing.Union[
137-
AdditionalPropertiesDict2,
138-
AdditionalProperties2[frozendict.frozendict],
139-
],
133+
arg: AdditionalPropertiesDict2,
140134
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
141135
) -> AdditionalProperties2[frozendict.frozendict]: ...
142136

@@ -219,10 +213,7 @@ def __getitem__(self, name: str) -> AdditionalProperties2[typing.Union[
219213
@classmethod
220214
def validate(
221215
cls,
222-
arg: typing.Union[
223-
_1Dict,
224-
_1[frozendict.frozendict],
225-
],
216+
arg: _1Dict,
226217
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
227218
) -> _1Dict:
228219
return super().validate(
@@ -288,10 +279,7 @@ def validate(
288279
@classmethod
289280
def validate(
290281
cls,
291-
arg: typing.Union[
292-
AdditionalPropertiesDict3,
293-
AdditionalProperties3[frozendict.frozendict],
294-
],
282+
arg: AdditionalPropertiesDict3,
295283
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
296284
) -> AdditionalProperties3[frozendict.frozendict]: ...
297285

@@ -374,10 +362,7 @@ def __getitem__(self, name: str) -> AdditionalProperties3[typing.Union[
374362
@classmethod
375363
def validate(
376364
cls,
377-
arg: typing.Union[
378-
_2Dict,
379-
_2[frozendict.frozendict],
380-
],
365+
arg: _2Dict,
381366
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
382367
) -> _2Dict:
383368
return super().validate(
@@ -414,10 +399,7 @@ class Schema_(metaclass=schemas.SingletonMeta):
414399
@classmethod
415400
def validate(
416401
cls,
417-
arg: typing.Union[
418-
AdditionalPropertiesValidatorDict,
419-
AdditionalPropertiesValidator[frozendict.frozendict],
420-
],
402+
arg: AdditionalPropertiesValidatorDict,
421403
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
422404
) -> AdditionalPropertiesValidatorDict:
423405
return super().validate(

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@ def __getitem__(self, name: str) -> AdditionalProperties[tuple]:
7373
@classmethod
7474
def validate(
7575
cls,
76-
arg: typing.Union[
77-
AdditionalPropertiesWithArrayOfEnumsDict,
78-
AdditionalPropertiesWithArrayOfEnums[frozendict.frozendict],
79-
],
76+
arg: AdditionalPropertiesWithArrayOfEnumsDict,
8077
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
8178
) -> AdditionalPropertiesWithArrayOfEnumsDict:
8279
return super().validate(

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ def __getitem__(self, name: str) -> AdditionalProperties[decimal.Decimal]:
4343
@classmethod
4444
def validate(
4545
cls,
46-
arg: typing.Union[
47-
AddressDict,
48-
Address[frozendict.frozendict],
49-
],
46+
arg: AddressDict,
5047
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
5148
) -> AddressDict:
5249
return super().validate(

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,7 @@ def __getitem__(
145145
@classmethod
146146
def validate(
147147
cls,
148-
arg: typing.Union[
149-
AnimalDictInput,
150-
Animal[frozendict.frozendict],
151-
],
148+
arg: AnimalDictInput,
152149
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
153150
) -> AnimalDict:
154151
return super().validate(

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

+10-40
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ def validate(
6969
@classmethod
7070
def validate(
7171
cls,
72-
arg: typing.Union[
73-
UuidDict,
74-
Uuid[frozendict.frozendict],
75-
],
72+
arg: UuidDict,
7673
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
7774
) -> Uuid[frozendict.frozendict]: ...
7875

@@ -162,10 +159,7 @@ def validate(
162159
@classmethod
163160
def validate(
164161
cls,
165-
arg: typing.Union[
166-
DateDict,
167-
Date[frozendict.frozendict],
168-
],
162+
arg: DateDict,
169163
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
170164
) -> Date[frozendict.frozendict]: ...
171165

@@ -255,10 +249,7 @@ def validate(
255249
@classmethod
256250
def validate(
257251
cls,
258-
arg: typing.Union[
259-
DateTimeDict,
260-
DateTime[frozendict.frozendict],
261-
],
252+
arg: DateTimeDict,
262253
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
263254
) -> DateTime[frozendict.frozendict]: ...
264255

@@ -348,10 +339,7 @@ def validate(
348339
@classmethod
349340
def validate(
350341
cls,
351-
arg: typing.Union[
352-
NumberDict,
353-
Number[frozendict.frozendict],
354-
],
342+
arg: NumberDict,
355343
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
356344
) -> Number[frozendict.frozendict]: ...
357345

@@ -440,10 +428,7 @@ def validate(
440428
@classmethod
441429
def validate(
442430
cls,
443-
arg: typing.Union[
444-
BinaryDict,
445-
Binary[frozendict.frozendict],
446-
],
431+
arg: BinaryDict,
447432
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
448433
) -> Binary[frozendict.frozendict]: ...
449434

@@ -532,10 +517,7 @@ def validate(
532517
@classmethod
533518
def validate(
534519
cls,
535-
arg: typing.Union[
536-
Int32Dict,
537-
Int32[frozendict.frozendict],
538-
],
520+
arg: Int32Dict,
539521
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
540522
) -> Int32[frozendict.frozendict]: ...
541523

@@ -624,10 +606,7 @@ def validate(
624606
@classmethod
625607
def validate(
626608
cls,
627-
arg: typing.Union[
628-
Int64Dict,
629-
Int64[frozendict.frozendict],
630-
],
609+
arg: Int64Dict,
631610
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
632611
) -> Int64[frozendict.frozendict]: ...
633612

@@ -716,10 +695,7 @@ def validate(
716695
@classmethod
717696
def validate(
718697
cls,
719-
arg: typing.Union[
720-
DoubleDict,
721-
Double[frozendict.frozendict],
722-
],
698+
arg: DoubleDict,
723699
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
724700
) -> Double[frozendict.frozendict]: ...
725701

@@ -808,10 +784,7 @@ def validate(
808784
@classmethod
809785
def validate(
810786
cls,
811-
arg: typing.Union[
812-
FloatDict,
813-
_Float[frozendict.frozendict],
814-
],
787+
arg: FloatDict,
815788
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
816789
) -> _Float[frozendict.frozendict]: ...
817790

@@ -1320,10 +1293,7 @@ def __getitem__(
13201293
@classmethod
13211294
def validate(
13221295
cls,
1323-
arg: typing.Union[
1324-
AnyTypeAndFormatDictInput,
1325-
AnyTypeAndFormat[frozendict.frozendict],
1326-
],
1296+
arg: AnyTypeAndFormatDictInput,
13271297
configuration: typing.Optional[schemas.schema_configuration.SchemaConfiguration] = None
13281298
) -> AnyTypeAndFormatDict:
13291299
return super().validate(

0 commit comments

Comments
 (0)