-
-
Notifications
You must be signed in to change notification settings - Fork 494
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
3d88e14
commit 31dae33
Showing
10 changed files
with
314 additions
and
4 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
24 changes: 24 additions & 0 deletions
24
...i-webmvc-core/src/test/java/test/org/springdoc/api/app155/AbstractIntParameterObject.java
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,24 @@ | ||
package test.org.springdoc.api.app155; | ||
|
||
public class AbstractIntParameterObject<T extends Integer> { | ||
|
||
int primitiveBaseField; | ||
|
||
T genericField; | ||
|
||
public int getPrimitiveBaseField() { | ||
return primitiveBaseField; | ||
} | ||
|
||
public void setPrimitiveBaseField(int primitiveBaseField) { | ||
this.primitiveBaseField = primitiveBaseField; | ||
} | ||
|
||
public T getGenericField() { | ||
return genericField; | ||
} | ||
|
||
public void setGenericField(T genericField) { | ||
this.genericField = genericField; | ||
} | ||
} |
28 changes: 28 additions & 0 deletions
28
...napi-webmvc-core/src/test/java/test/org/springdoc/api/app155/AbstractParameterObject.java
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,28 @@ | ||
package test.org.springdoc.api.app155; | ||
|
||
import io.swagger.v3.oas.annotations.Parameter; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
|
||
public class AbstractParameterObject<T extends Enum<T>> { | ||
|
||
int primitiveBaseField; | ||
|
||
@Parameter(schema=@Schema(type = "string", allowableValues = {"ONE", "TWO"}) ) | ||
T genericField; | ||
|
||
public int getPrimitiveBaseField() { | ||
return primitiveBaseField; | ||
} | ||
|
||
public void setPrimitiveBaseField(int primitiveBaseField) { | ||
this.primitiveBaseField = primitiveBaseField; | ||
} | ||
|
||
public T getGenericField() { | ||
return genericField; | ||
} | ||
|
||
public void setGenericField(T genericField) { | ||
this.genericField = genericField; | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app155/ConcreteEnum.java
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,9 @@ | ||
package test.org.springdoc.api.app155; | ||
|
||
|
||
|
||
enum ConcreteEnum { | ||
ONE, | ||
TWO | ||
|
||
} |
14 changes: 14 additions & 0 deletions
14
...i-webmvc-core/src/test/java/test/org/springdoc/api/app155/ConcreteIntParameterObject.java
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,14 @@ | ||
package test.org.springdoc.api.app155; | ||
|
||
public class ConcreteIntParameterObject extends AbstractIntParameterObject<Integer>{ | ||
|
||
int primitiveConcreteField; | ||
|
||
public int getPrimitiveConcreteField() { | ||
return primitiveConcreteField; | ||
} | ||
|
||
public void setPrimitiveConcreteField(int primitiveConcreteField) { | ||
this.primitiveConcreteField = primitiveConcreteField; | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
...napi-webmvc-core/src/test/java/test/org/springdoc/api/app155/ConcreteParameterObject.java
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,14 @@ | ||
package test.org.springdoc.api.app155; | ||
|
||
public class ConcreteParameterObject extends AbstractParameterObject<ConcreteEnum> { | ||
|
||
int primitiveConcreteField; | ||
|
||
public int getPrimitiveConcreteField() { | ||
return primitiveConcreteField; | ||
} | ||
|
||
public void setPrimitiveConcreteField(int primitiveConcreteField) { | ||
this.primitiveConcreteField = primitiveConcreteField; | ||
} | ||
} |
44 changes: 44 additions & 0 deletions
44
...gdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app155/HelloController.java
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,44 @@ | ||
/* | ||
* | ||
* * 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.app155; | ||
|
||
import org.springdoc.api.annotations.ParameterObject; | ||
|
||
import org.springframework.http.HttpStatus; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
public class HelloController { | ||
|
||
@GetMapping( "/test1") | ||
public ResponseEntity<String> sayHello( @ParameterObject final ConcreteParameterObject test) { | ||
System.out.println("Field B = " + test); | ||
return new ResponseEntity<String>("{\"Say\": \"Hello\"}", HttpStatus.OK); | ||
} | ||
|
||
@GetMapping( "/test2") | ||
public ResponseEntity<String> sayHello( @ParameterObject final ConcreteIntParameterObject test) { | ||
System.out.println("Field B = " + test); | ||
return new ResponseEntity<String>("{\"Say\": \"Hello\"}", HttpStatus.OK); | ||
} | ||
|
||
|
||
} |
34 changes: 34 additions & 0 deletions
34
...-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app155/SpringDocApp155Test.java
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,34 @@ | ||
/* | ||
* | ||
* * 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.app155; | ||
|
||
|
||
import test.org.springdoc.api.AbstractSpringDocTest; | ||
|
||
import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
|
||
/** | ||
* Tests Spring meta-annotations as method parameters | ||
*/ | ||
public class SpringDocApp155Test extends AbstractSpringDocTest { | ||
|
||
@SpringBootApplication | ||
static class SpringDocTestApp {} | ||
|
||
} |
117 changes: 117 additions & 0 deletions
117
springdoc-openapi-webmvc-core/src/test/resources/results/app155.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,117 @@ | ||
{ | ||
"openapi": "3.0.1", | ||
"info": { | ||
"title": "OpenAPI definition", | ||
"version": "v0" | ||
}, | ||
"servers": [ | ||
{ | ||
"url": "http://localhost", | ||
"description": "Generated server url" | ||
} | ||
], | ||
"paths": { | ||
"/test2": { | ||
"get": { | ||
"tags": [ | ||
"hello-controller" | ||
], | ||
"operationId": "sayHello", | ||
"parameters": [ | ||
{ | ||
"name": "primitiveConcreteField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "integer", | ||
"format": "int32" | ||
} | ||
}, | ||
{ | ||
"name": "primitiveBaseField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "integer", | ||
"format": "int32" | ||
} | ||
}, | ||
{ | ||
"name": "genericField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "integer", | ||
"format": "int32" | ||
} | ||
} | ||
], | ||
"responses": { | ||
"200": { | ||
"description": "OK", | ||
"content": { | ||
"*/*": { | ||
"schema": { | ||
"type": "string" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
"/test1": { | ||
"get": { | ||
"tags": [ | ||
"hello-controller" | ||
], | ||
"operationId": "sayHello_1", | ||
"parameters": [ | ||
{ | ||
"name": "primitiveConcreteField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "integer", | ||
"format": "int32" | ||
} | ||
}, | ||
{ | ||
"name": "primitiveBaseField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "integer", | ||
"format": "int32" | ||
} | ||
}, | ||
{ | ||
"name": "genericField", | ||
"in": "query", | ||
"required": false, | ||
"schema": { | ||
"type": "string", | ||
"enum": [ | ||
"ONE", | ||
"TWO" | ||
] | ||
} | ||
} | ||
], | ||
"responses": { | ||
"200": { | ||
"description": "OK", | ||
"content": { | ||
"*/*": { | ||
"schema": { | ||
"type": "string" | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
"components": {} | ||
} |