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

Adds redirection response deserialization as non-error #152

Merged
merged 3 commits into from
Apr 10, 2023
Merged

Adds redirection response deserialization as non-error #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c04258
Adds redirection response deserialization as non-error
spacether Apr 10, 2023
d20ef7b
Adds redirection response sample + doc feature
spacether Apr 10, 2023
0ce2ad4
Sample regen, test added
spacether Apr 10, 2023
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
7 changes: 4 additions & 3 deletions docs/generators/java.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
### Operation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Responses_HttpStatusCode|✓|OAS2,OAS3
|Responses_RangedResponseCodes|✗|OAS2,OAS3
|Responses_Default|✓|OAS2,OAS3
|Responses_HttpStatusCode|✓|OAS3
|Responses_RangedResponseCodes|✗|OAS3
|Responses_Default|✓|OAS3
|Responses_RedirectionResponse|✗|OAS3

### Parameter Feature
| Name | Supported | Defined By |
Expand Down
7 changes: 4 additions & 3 deletions docs/generators/jaxrs-jersey.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
### Operation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Responses_HttpStatusCode|✓|OAS2,OAS3
|Responses_RangedResponseCodes|✗|OAS2,OAS3
|Responses_Default|✓|OAS2,OAS3
|Responses_HttpStatusCode|✓|OAS3
|Responses_RangedResponseCodes|✗|OAS3
|Responses_Default|✓|OAS3
|Responses_RedirectionResponse|✗|OAS3

### Parameter Feature
| Name | Supported | Defined By |
Expand Down
7 changes: 4 additions & 3 deletions docs/generators/jmeter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
### Operation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Responses_HttpStatusCode|✓|OAS2,OAS3
|Responses_RangedResponseCodes|✗|OAS2,OAS3
|Responses_Default|✓|OAS2,OAS3
|Responses_HttpStatusCode|✓|OAS3
|Responses_RangedResponseCodes|✗|OAS3
|Responses_Default|✓|OAS3
|Responses_RedirectionResponse|✗|OAS3

### Parameter Feature
| Name | Supported | Defined By |
Expand Down
7 changes: 4 additions & 3 deletions docs/generators/kotlin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
### Operation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Responses_HttpStatusCode|✓|OAS2,OAS3
|Responses_RangedResponseCodes|✗|OAS2,OAS3
|Responses_Default|✓|OAS2,OAS3
|Responses_HttpStatusCode|✓|OAS3
|Responses_RangedResponseCodes|✗|OAS3
|Responses_Default|✓|OAS3
|Responses_RedirectionResponse|✗|OAS3

### Parameter Feature
| Name | Supported | Defined By |
Expand Down
7 changes: 4 additions & 3 deletions docs/generators/python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
### Operation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Responses_HttpStatusCode|✓|OAS2,OAS3
|Responses_RangedResponseCodes|✓|OAS2,OAS3
|Responses_Default|✓|OAS2,OAS3
|Responses_HttpStatusCode|✓|OAS3
|Responses_RangedResponseCodes|✓|OAS3
|Responses_Default|✓|OAS3
|Responses_RedirectionResponse|✓|OAS3

### Parameter Feature
| Name | Supported | Defined By |
Expand Down
12 changes: 6 additions & 6 deletions ...core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
* Defines Operation features supported in the generated code.
*/
public enum OperationFeature {
/**
* Supports header-based basic http auth.
*/
@OAS2 @OAS3
@OAS3
Responses_HttpStatusCode,

@OAS2 @OAS3
@OAS3
Responses_RangedResponseCodes,

@OAS2 @OAS3
@OAS3
Responses_Default,

@OAS3
Responses_RedirectionResponse,
}
3 changes: 2 additions & 1 deletion ...rator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ public PythonClientCodegen() {
ParameterFeature.Content
)
.includeOperationFeatures(
OperationFeature.Responses_RangedResponseCodes
OperationFeature.Responses_RangedResponseCodes,
OperationFeature.Responses_RedirectionResponse
)
.excludeParameterFeatures(
ParameterFeature.In_Cookie
Expand Down
4 changes: 2 additions & 2 deletions ...ma-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ public Map<String, CodegenResponse> getNonErrorResponses() {
HashMap<String,CodegenResponse> nonErrorResponses = new HashMap<>();
if (statusCodeResponses != null) {
for (Map.Entry<Integer, CodegenResponse> entry: statusCodeResponses.entrySet()) {
if (entry.getKey() >= 200 && entry.getKey() <= 299) {
if (entry.getKey() >= 200 && entry.getKey() <= 399) {
nonErrorResponses.put(entry.getKey().toString(), entry.getValue());
}
}
}
if (wildcardCodeResponses != null) {
for (Map.Entry<Integer, CodegenResponse> entry: wildcardCodeResponses.entrySet()) {
if (entry.getKey() == 2) {
if (entry.getKey() == 2 || entry.getKey() == 3) {
nonErrorResponses.put(entry.getKey().toString(), entry.getValue());
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...les/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ class BaseApi(api_client.Api):
{{/if}}
{{/if}}

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
11 changes: 11 additions & 0 deletions modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore_customized.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,6 +1681,17 @@ paths:
content:
application/json:
schema: {}
/fake/redirection:
get:
operationId: redirection
summary: operation with redirection responses
tags:
- fake
responses:
303:
description: see other
3XX:
description: 3XX response
servers:
- url: 'http://{server}.swagger.io:{port}/v2'
description: petstore server
Expand Down
2 changes: 1 addition & 1 deletion ...additionalproperties_allows_a_schema_which_should_validate_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...uest_body_post_additionalproperties_are_allowed_by_default_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...request_body_post_additionalproperties_can_exist_by_itself_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...y_post_additionalproperties_should_not_look_in_applicators_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...pi/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...est/python/src/unit_test_api/paths/request_body_post_allof_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...c/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...it_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...st_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion .../paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...i/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...t_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion .../unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...est/python/src/unit_test_api/paths/request_body_post_anyof_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...it_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...st_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ..._api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...st/python/src/unit_test_api/paths/request_body_post_by_int_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...python/src/unit_test_api/paths/request_body_post_by_number_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion .../src/unit_test_api/paths/request_body_post_by_small_number_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...src/unit_test_api/paths/request_body_post_date_time_format_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...hon/src/unit_test_api/paths/request_body_post_email_format_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...pi/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...t_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...pi/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
2 changes: 1 addition & 1 deletion ...api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class instances
else:
api_response = api_client.ApiResponseWithoutDeserialization(response=response)

if not 200 <= response.status <= 299:
if not 200 <= response.status <= 399:
raise exceptions.ApiException(
status=response.status,
reason=response.reason,
Expand Down
Loading