-
-
Notifications
You must be signed in to change notification settings - Fork 507
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e1fff95
commit 3114c10
Showing
6 changed files
with
192 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
...pi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/app14/SpringDocApp14Test.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * | ||
| * * Copyright 2019-2020 the original author or authors. | ||
| * * | ||
| * * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * * you may not use this file except in compliance with the License. | ||
| * * You may obtain a copy of the License at | ||
| * * | ||
| * * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * * | ||
| * * Unless required by applicable law or agreed to in writing, software | ||
| * * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * * See the License for the specific language governing permissions and | ||
| * * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package test.org.springdoc.api.app14 | ||
|
|
||
| import org.springframework.boot.autoconfigure.SpringBootApplication | ||
| import org.springframework.context.annotation.ComponentScan | ||
| import test.org.springdoc.api.AbstractKotlinSpringDocMVCTest | ||
|
|
||
| class SpringDocApp14Test : AbstractKotlinSpringDocMVCTest() { | ||
|
|
||
| @SpringBootApplication | ||
| class DemoApplication | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
...penapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/app14/TestController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * | ||
| * * Copyright 2019-2020 the original author or authors. | ||
| * * | ||
| * * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * * you may not use this file except in compliance with the License. | ||
| * * You may obtain a copy of the License at | ||
| * * | ||
| * * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * * | ||
| * * Unless required by applicable law or agreed to in writing, software | ||
| * * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * * See the License for the specific language governing permissions and | ||
| * * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package test.org.springdoc.api.app14 | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema | ||
| import org.springframework.web.bind.annotation.PostMapping | ||
| import org.springframework.web.bind.annotation.RequestBody | ||
| import org.springframework.web.bind.annotation.RequestMapping | ||
| import org.springframework.web.bind.annotation.RestController | ||
|
|
||
| @Schema(description = "Generic description") | ||
| data class KeyValue( | ||
| val key: String, | ||
| val value: String, | ||
| ) | ||
|
|
||
| @Schema | ||
| data class SomeDTO( | ||
| @Schema(description = "Description A", allOf = [KeyValue::class]) val field_a: KeyValue, | ||
| @Schema(description = "Description B", allOf = [KeyValue::class]) val field_b: KeyValue, | ||
| ) | ||
|
|
||
| @RestController | ||
| @RequestMapping("/test") | ||
| class TestController { | ||
|
|
||
| @PostMapping("/test") | ||
| fun create(@RequestBody some: SomeDTO) { | ||
|
|
||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
...openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/app14.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| "openapi": "3.0.1", | ||
| "info": { | ||
| "title": "OpenAPI definition", | ||
| "version": "v0" | ||
| }, | ||
| "servers": [ | ||
| { | ||
| "url": "http://localhost", | ||
| "description": "Generated server url" | ||
| } | ||
| ], | ||
| "paths": { | ||
| "/test/test": { | ||
| "post": { | ||
| "tags": [ | ||
| "test-controller" | ||
| ], | ||
| "operationId": "create", | ||
| "requestBody": { | ||
| "content": { | ||
| "application/json": { | ||
| "schema": { | ||
| "$ref": "#/components/schemas/SomeDTO" | ||
| } | ||
| } | ||
| }, | ||
| "required": true | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "description": "OK" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "components": { | ||
| "schemas": { | ||
| "KeyValue": { | ||
| "required": [ | ||
| "key", | ||
| "value" | ||
| ], | ||
| "type": "object", | ||
| "description": "Generic description", | ||
| "allOf": [ | ||
| { | ||
| "$ref": "#/components/schemas/KeyValue" | ||
| }, | ||
| { | ||
| "type": "object", | ||
| "properties": { | ||
| "key": { | ||
| "type": "string" | ||
| }, | ||
| "value": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "SomeDTO": { | ||
| "required": [ | ||
| "field_a", | ||
| "field_b" | ||
| ], | ||
| "type": "object", | ||
| "properties": { | ||
| "field_a": { | ||
| "$ref": "#/components/schemas/KeyValue" | ||
| }, | ||
| "field_b": { | ||
| "$ref": "#/components/schemas/KeyValue" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |